Novice 5041d96bb1 Merge commit 'fb41b215' into sandboxed-agent-rebase ...

Made-with: Cursor

# Conflicts:
#	.devcontainer/post_create_command.sh
#	api/commands.py
#	api/core/agent/cot_agent_runner.py
#	api/core/agent/fc_agent_runner.py
#	api/core/app/apps/workflow_app_runner.py
#	api/core/app/entities/queue_entities.py
#	api/core/app/entities/task_entities.py
#	api/core/workflow/workflow_entry.py
#	api/dify_graph/enums.py
#	api/dify_graph/graph/graph.py
#	api/dify_graph/graph_events/node.py
#	api/dify_graph/model_runtime/entities/message_entities.py
#	api/dify_graph/node_events/node.py
#	api/dify_graph/nodes/agent/agent_node.py
#	api/dify_graph/nodes/base/__init__.py
#	api/dify_graph/nodes/base/entities.py
#	api/dify_graph/nodes/base/node.py
#	api/dify_graph/nodes/llm/entities.py
#	api/dify_graph/nodes/llm/node.py
#	api/dify_graph/nodes/tool/tool_node.py
#	api/pyproject.toml
#	api/uv.lock
#	web/app/components/base/avatar/__tests__/index.spec.tsx
#	web/app/components/base/avatar/index.tsx
#	web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
#	web/app/components/base/file-uploader/file-from-link-or-local/index.tsx
#	web/app/components/base/prompt-editor/index.tsx
#	web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
#	web/app/components/header/account-dropdown/index.spec.tsx
#	web/app/components/share/text-generation/index.tsx
#	web/app/components/workflow/block-selector/tool/action-item.tsx
#	web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
#	web/app/components/workflow/hooks/use-edges-interactions.ts
#	web/app/components/workflow/hooks/use-nodes-interactions.ts
#	web/app/components/workflow/index.tsx
#	web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
#	web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
#	web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx
#	web/app/components/workflow/nodes/loop/use-interactions.ts
#	web/contract/router.ts
#	web/env.ts
#	web/eslint-suppressions.json
#	web/package.json
#	web/pnpm-lock.yaml

2026-03-23 10:52:06 +08:00

..

auth

fix: fix firecrawl url concat (#30008)

2025-12-24 09:40:32 +08:00

document_indexing_proxy

feat: enable tenant isolation on duplicate document indexing tasks (#29080)

2025-12-08 17:54:57 +08:00

enterprise

feat: enterprise plugin pre uninstall (#33158)

2026-03-10 15:03:37 +08:00

entities

fix: Add the missing validation of doc_form in the service API. (#32892)

2026-03-03 15:54:43 +08:00

errors

feat(app-assets): add file download functionality with pre-signed URLs and enhance asset management

2026-01-15 17:20:10 +08:00

plugin

feat: enterprise plugin pre uninstall (#33158)

2026-03-10 15:03:37 +08:00

rag_pipeline

refactor(api): move workflow knowledge nodes and trigger nodes (#33445)

2026-03-15 15:24:59 +08:00

recommend_app

change all to httpx (#26119)

2025-10-10 23:41:16 +08:00

retention

fix: correctly detect required columns in archived workflow run restore (#33403)

2026-03-13 23:24:40 +08:00

sandbox

fix: namespace sandbox temp paths by sandbox ID to prevent cross-session collisions

2026-03-11 19:19:17 +08:00

tools

Merge commit 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +08:00

trigger

Merge commit 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +08:00

workflow

Merge commit 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +08:00

__init__.py

chore(api/services): apply ruff reformatting (#7599)

2024-08-26 13:43:57 +08:00

account_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

advanced_prompt_template_service.py

chore: adopt StrEnum and auto() for some string-typed enums (#25129)

2025-09-12 21:14:26 +08:00

agent_service.py

use deco to avoid current_user (#26077)

2025-10-16 15:45:51 +09:00

annotation_service.py

refactor: port api/controllers/console/app/annotation.py api/controllers/console/explore/trial.py api/controllers/console/workspace/account.py api/controllers/console/workspace/members.py api/controllers/service_api/app/annotation.py to basemodel (#31833)

2026-02-03 09:59:00 +08:00

api_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

api_token_service.py

fix: redis for api token (#31861)

2026-02-06 16:25:27 +08:00

app_asset_package_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_asset_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_bundle_service.py

refactor: unify download item types and eliminate extension-based branching

2026-03-10 17:12:15 +08:00

app_dsl_service.py

refactor(api): move workflow knowledge nodes and trigger nodes (#33445)

2026-03-15 15:24:59 +08:00

app_generate_service.py

feat: support redis xstream (#32586)

2026-03-04 13:18:55 +08:00

app_model_config_service.py

refactor(api): add TypedDict definitions to models/model.py (#32925)

2026-03-06 08:42:54 +09:00

app_runtime_upgrade_service.py

feat: implement app runtime upgrade feature to clone and convert classic runtime apps to sandboxed mode

2026-03-17 13:54:16 +08:00

app_service.py

refactor(api): move workflow knowledge nodes and trigger nodes (#33445)

2026-03-15 15:24:59 +08:00

app_task_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

asset_content_service.py

feat: add DB inline content cache for app asset draft files

2026-03-10 17:12:14 +08:00

async_workflow_service.py

refactor: remove unnecessary type: async_workflow_service.py (#32081)

2026-02-08 03:26:30 +09:00

attachment_service.py

Feat/support multimodal embedding (#29115)

2025-12-09 14:41:46 +08:00

audio_service.py

refactor(api): add TypedDict definitions to models/model.py (#32925)

2026-03-06 08:42:54 +09:00

billing_service.py

feat: notification (#32192)

2026-03-11 18:29:53 +08:00

clear_free_plan_tenant_expired_logs.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

code_based_extension_service.py

remove bare list, dict, Sequence, None, Any (#25058)

2025-09-06 03:32:23 +08:00

conversation_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

conversation_variable_updater.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

credit_pool_service.py

feat: credit pool (#30720)

2026-01-08 13:17:30 +08:00

dataset_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

datasource_provider_service.py

fix: use correct plugin_id for WaterCrawl datasource (#33182)

2026-03-10 13:32:40 +08:00

end_user_service.py

feat: Service API - add end-user lookup endpoint (#32015)

2026-02-09 15:39:16 +08:00

external_knowledge_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

feature_service.py

feat: add Creators Platform helper for DSL upload and OAuth redirect (Vibe Kanban) (#32232)

2026-02-11 21:10:48 +08:00

feedback_service.py

test: add comprehensive unit tests for FeedbackService (#28771)

2025-11-28 11:33:56 +08:00

file_service.py

fix(api): allow punctuation in uploaded filenames (#33364)

2026-03-13 21:33:09 +08:00

hit_testing_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

human_input_delivery_test_service.py

fix: fix failed test (#33241)

2026-03-11 09:37:19 +08:00

human_input_service.py

refactor: human input node decouple db (#32900)

2026-03-04 13:18:32 +08:00

knowledge_service.py

rm type ignore (#25715)

2025-10-21 11:26:58 +08:00

llm_generation_service.py

chore: remove unused changes

2025-12-10 15:04:19 +08:00

message_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

metadata_service.py

fix: metadata batch edit silently fails due to split transactions and swallowed exceptions (#32041)

2026-02-12 12:59:59 +08:00

model_load_balancing_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

model_provider_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

oauth_server.py

use deco to avoid current_user (#26077)

2025-10-16 15:45:51 +09:00

operation_service.py

more httpx (#25651)

2025-09-22 23:07:09 +08:00

ops_service.py

feat: MLflow tracing (#26093)

2025-11-22 13:53:58 +08:00

recommended_app_service.py

feat: app trial (#26281)

2026-01-22 15:42:54 +08:00

saved_message_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

skill_service.py

style: auto-format after segment 3 import migrations

2026-03-23 10:37:02 +08:00

storage_ticket_service.py

fix: agentbox using nginx for traffic proxy

2026-02-15 11:31:22 +08:00

summary_index_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

tag_service.py

fix: "refactor: port api/controllers/console/tag/tags.py to ov3" (#31887)

2026-02-03 22:18:53 +08:00

variable_truncator.py

Merge commit '92bde350' into sandboxed-agent-rebase

2026-03-23 09:39:49 +08:00

vector_service.py

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

web_conversation_service.py

refactor: replace sa.String with EnumText in mapped_column for type s… (#33332)

2026-03-14 13:38:27 +09:00

webapp_auth_service.py

chore: case insensitive email (#29978)

2026-01-13 15:42:44 +08:00

website_service.py

fix: use correct plugin_id for WaterCrawl datasource (#33182)

2026-03-10 13:32:40 +08:00

workflow_app_service.py

refactor(dify_graph): introduce run_context and delegate child engine creation (#32964)

2026-03-05 14:31:28 +08:00

workflow_collaboration_service.py

fix: make sure restart server not get ghost online user

2026-02-07 09:48:07 +08:00

workflow_comment_service.py

feat: mentioned user email can directly open app

2026-02-14 15:08:20 +08:00

workflow_draft_variable_service.py

refactor(api): move workflow knowledge nodes and trigger nodes (#33445)

2026-03-15 15:24:59 +08:00

workflow_event_snapshot_service.py

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

workflow_run_service.py

refactor(llm node): tool call tool result entity

2025-12-17 10:30:21 +08:00

workflow_service.py

Merge commit 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +08:00

workspace_service.py

fix: When the user is a non-sandbox user and has a paid balance, the … (#32173)

2026-02-10 15:36:40 +08:00