refactor(dataset): validate declared KnowledgeFS operations

Fixes WTA-1411

.github/workflows/main-ci.yml

@@ -72,6 +72,7 @@ jobs:
               - 'docker/volumes/sandbox/conf/**'
             cli:
               - 'cli/**'
+              - 'packages/contracts/**'
               - 'packages/tsconfig/**'
               - 'package.json'
               - 'pnpm-lock.yaml'
@@ -105,6 +106,7 @@ jobs:
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/envs/middleware.env.example'
               - '.github/workflows/web-e2e.yml'
+              - '.github/workflows/main-ci.yml'
               - '.github/actions/setup-web/**'
             vdb:
               - 'api/core/rag/datasource/**'

.github/workflows/web-e2e.yml

@@ -19,6 +19,7 @@ jobs:
   test:
     name: Web Full-Stack E2E
     runs-on: depot-ubuntu-24.04-4
+    timeout-minutes: 120
     defaults:
       run:
         shell: bash
@@ -62,7 +63,52 @@ jobs:
           E2E_INIT_PASSWORD: E2eInit12345
         run: vp run e2e:full
 
-      - name: Run external runtime E2E tests
+      - name: Preserve Chromium E2E report and logs
+        if: ${{ !cancelled() }}
+        run: |
+          if [[ -d e2e/cucumber-report ]]; then
+            mv e2e/cucumber-report e2e/cucumber-report-non-external
+          fi
+          if [[ -d e2e/.logs ]]; then
+            mv e2e/.logs e2e/.logs-non-external
+          fi
+
+      - name: Run WebKit keyboard and browser smoke tests
+        working-directory: ./e2e
+        env:
+          E2E_ADMIN_EMAIL: [email protected]
+          E2E_ADMIN_NAME: E2E Admin
+          E2E_ADMIN_PASSWORD: E2eAdmin12345
+          E2E_BROWSER: webkit
+          E2E_INIT_PASSWORD: E2eInit12345
+        run: |
+          teardown_webkit_smoke() {
+            local run_status=$?
+            trap - EXIT
+            if ! vp run e2e:middleware:down; then
+              echo "::error title=E2E teardown failed::WebKit smoke middleware did not shut down cleanly."
+              if [[ "$run_status" -eq 0 ]]; then
+                run_status=1
+              fi
+            fi
+            exit "$run_status"
+          }
+
+          trap teardown_webkit_smoke EXIT
+          vp run e2e:middleware:up
+          vp run e2e -- --tags '@browser-smoke'
+
+      - name: Preserve WebKit E2E report and logs
+        if: ${{ !cancelled() }}
+        run: |
+          if [[ -d e2e/cucumber-report ]]; then
+            mv e2e/cucumber-report e2e/cucumber-report-webkit
+          fi
+          if [[ -d e2e/.logs ]]; then
+            mv e2e/.logs e2e/.logs-webkit
+          fi
+
+      - name: Run prepared and external runtime E2E tests
         if: ${{ inputs.run-external-runtime }}
         working-directory: ./e2e
         env:
@@ -72,13 +118,10 @@ jobs:
           E2E_AGENT_DECISION_MODEL_NAME: ${{ vars.E2E_AGENT_DECISION_MODEL_NAME || 'gpt-5.5' }}
           E2E_AGENT_DECISION_MODEL_PROVIDER: ${{ vars.E2E_AGENT_DECISION_MODEL_PROVIDER || 'openai' }}
           E2E_AGENT_DECISION_MODEL_TYPE: ${{ vars.E2E_AGENT_DECISION_MODEL_TYPE || 'llm' }}
-          E2E_EXTERNAL_RUNTIME_SEED_SPECS: ${{ vars.E2E_EXTERNAL_RUNTIME_SEED_SPECS }}
-          E2E_EXTERNAL_RUNTIME_TAGS: ${{ vars.E2E_EXTERNAL_RUNTIME_TAGS }}
           E2E_FORCE_WEB_BUILD: "1"
           E2E_INIT_PASSWORD: E2eInit12345
           E2E_MARKETPLACE_API_URL: ${{ vars.E2E_MARKETPLACE_API_URL }}
           E2E_MARKETPLACE_PLUGIN_IDS: ${{ vars.E2E_MARKETPLACE_PLUGIN_IDS }}
-          E2E_MARKETPLACE_PLUGIN_UNIQUE_IDENTIFIERS: ${{ vars.E2E_MARKETPLACE_PLUGIN_UNIQUE_IDENTIFIERS }}
           E2E_MODEL_PROVIDER_CREDENTIALS_JSON: ${{ secrets.E2E_MODEL_PROVIDER_CREDENTIALS_JSON }}
           E2E_SPEECH_TO_TEXT_MODEL_NAME: ${{ vars.E2E_SPEECH_TO_TEXT_MODEL_NAME || 'gpt-4o-mini-transcribe' }}
           E2E_SPEECH_TO_TEXT_MODEL_PROVIDER: ${{ vars.E2E_SPEECH_TO_TEXT_MODEL_PROVIDER || 'openai' }}
@@ -102,10 +145,22 @@ jobs:
             mv .logs .logs-non-external
           fi
 
-          trap 'vp run e2e:middleware:down' EXIT
+          teardown_external_runtime() {
+            local run_status=$?
+            trap - EXIT
+            if ! vp run e2e:middleware:down; then
+              echo "::error title=E2E teardown failed::External runtime middleware did not shut down cleanly."
+              if [[ "$run_status" -eq 0 ]]; then
+                run_status=1
+              fi
+            fi
+            exit "$run_status"
+          }
+
+          trap teardown_external_runtime EXIT
           vp run e2e:middleware:up
-          vp run e2e:external:prepare
-          vp run e2e:external
+          vp run e2e:post-merge:prepare
+          vp run e2e:post-merge
 
       - name: Upload Cucumber report
         if: ${{ !cancelled() }}
@@ -115,6 +170,7 @@ jobs:
           path: |
             e2e/cucumber-report
             e2e/cucumber-report-non-external
+            e2e/cucumber-report-webkit
           retention-days: 7
 
       - name: Upload E2E logs
@@ -125,5 +181,15 @@ jobs:
           path: |
             e2e/.logs/*.log
             e2e/.logs-non-external/*.log
+            e2e/.logs-webkit/*.log
           include-hidden-files: true
           retention-days: 7
+
+      - name: Upload E2E seed report
+        if: ${{ !cancelled() && inputs.run-external-runtime }}
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: e2e-seed-report
+          path: e2e/seed-report
+          if-no-files-found: ignore
+          retention-days: 7

.vscode/launch.json.template

@@ -5,7 +5,9 @@
             "name": "Python: API (gevent)",
             "type": "debugpy",
             "request": "launch",
-            "program": "${workspaceFolder}/api/app.py",
+            "module": "gevent.monkey",
+            "args": ["--module", "app"],
+            "gevent": true,
             "jinja": true,
             "justMyCode": true,
             "cwd": "${workspaceFolder}/api",
@@ -33,22 +35,6 @@
             "justMyCode": false,
             "cwd": "${workspaceFolder}/api",
             "python": "${workspaceFolder}/api/.venv/bin/python"
-        },
-        {
-            "name": "Next.js: debug full stack",
-            "type": "node",
-            "request": "launch",
-            "program": "${workspaceFolder}/web/node_modules/next/dist/bin/next",
-            "runtimeArgs": ["--inspect"],
-            "skipFiles": ["<node_internals>/**"],
-            "serverReadyAction": {
-              "action": "debugWithChrome",
-              "killOnServerStop": true,
-              "pattern": "- Local:.+(https?://.+)",
-              "uriFormat": "%s",
-              "webRoot": "${workspaceFolder}/web"
-            },
-            "cwd": "${workspaceFolder}/web"
-          }
+        }
     ]
 }

README.md

@@ -15,7 +15,7 @@
     <a href="https://discord.gg/FngNHpbcY7" target="_blank">
         <img src="https://img.shields.io/discord/1082486657678311454?logo=discord&labelColor=%20%235462eb&logoColor=%20%23f5f5f5&color=%20%235462eb"
             alt="chat on Discord"></a>
-    <a href="https://reddit.com/r/difyai" target="_blank">  
+    <a href="https://reddit.com/r/difyai" target="_blank">
         <img src="https://img.shields.io/reddit/subreddit-subscribers/difyai?style=plastic&logo=reddit&label=r%2Fdifyai&labelColor=white"
             alt="join Reddit"></a>
     <a href="https://twitter.com/intent/follow?screen_name=dify_ai" target="_blank">

api/.env.example

@@ -561,6 +561,8 @@ WORKFLOW_MAX_EXECUTION_STEPS=500
 WORKFLOW_MAX_EXECUTION_TIME=1200
 WORKFLOW_CALL_MAX_DEPTH=5
 MAX_VARIABLE_SIZE=204800
+# Maximum concurrent node-builder LLM calls per workflow generation request
+WORKFLOW_GENERATOR_NODE_BUILDER_MAX_WORKERS=6
 
 # GraphEngine Worker Pool Configuration
 # Minimum number of workers per GraphEngine instance (default: 1)
@@ -665,6 +667,12 @@ PLUGIN_REMOTE_INSTALL_HOST=localhost
 PLUGIN_MAX_PACKAGE_SIZE=15728640
 PLUGIN_MODEL_SCHEMA_CACHE_TTL=3600
 PLUGIN_MODEL_PROVIDERS_CACHE_TTL=86400
+# Comma-separated marketplace plugin IDs whose latest versions are installed for newly registered users.
+# Example: langgenius/openai,langgenius/gemini
+NEW_USER_DEFAULT_PLUGIN_IDS=
+# Comma-separated model_type:provider:model entries assigned after default plugins finish installing.
+# Example: llm:langgenius/openai/openai:gpt-4o-mini,text-embedding:langgenius/openai/openai:text-embedding-3-small
+NEW_USER_DEFAULT_MODELS=
 INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
 
 # Dify Agent backend

api/app.py

@@ -1,5 +1,24 @@
 from __future__ import annotations
 
+# ``python -m app`` (docker DEBUG=true, or IDE debugging) serves through the
+# gevent pywsgi server at the bottom of this file, so the stdlib must be
+# monkey-patched BEFORE any other import pulls in sockets or locks. Without
+# this, every request runs as a greenlet on one OS thread while blocking
+# calls (LLM invokes, ``Future.result`` waits, DB I/O) pin that thread — the
+# whole process freezes until the call returns. Gunicorn and Celery apply
+# their own patching (see gunicorn.conf.py / celery_entrypoint.py), and
+# ``flask run`` uses real Werkzeug threads, so both skip this branch.
+if __name__ == "__main__":
+    from gevent import monkey
+
+    monkey.patch_all()
+
+    import psycogreen.gevent as psycogreen_gevent
+    from grpc.experimental import gevent as grpc_gevent
+
+    grpc_gevent.init_gevent()
+    psycogreen_gevent.patch_psycopg()
+
 import logging
 import sys
 from typing import TYPE_CHECKING, cast

api/configs/feature/__init__.py

@@ -275,6 +275,42 @@ class PluginConfig(BaseSettings):
         default=50 * 1024 * 1024,
     )
 
+    NEW_USER_DEFAULT_PLUGIN_IDS: str = Field(
+        description="Comma-separated marketplace plugin IDs whose latest versions are installed for new users",
+        default="",
+    )
+
+    @property
+    def NEW_USER_DEFAULT_PLUGIN_ID_LIST(self) -> list[str]:
+        return [item.strip() for item in self.NEW_USER_DEFAULT_PLUGIN_IDS.split(",") if item.strip()]
+
+    NEW_USER_DEFAULT_MODELS: str = Field(
+        description=("Comma-separated default models for new users in 'model_type:provider:model' format"),
+        default="",
+    )
+
+    @property
+    def NEW_USER_DEFAULT_MODEL_LIST(self) -> list[tuple[str, str, str]]:
+        default_models: list[tuple[str, str, str]] = []
+        configured_model_types: set[str] = set()
+
+        for item in self.NEW_USER_DEFAULT_MODELS.split(","):
+            if not item.strip():
+                continue
+
+            parts = tuple(part.strip() for part in item.split(":", 2))
+            if len(parts) != 3 or not all(parts):
+                raise ValueError("NEW_USER_DEFAULT_MODELS entries must use 'model_type:provider:model' format")
+
+            model_type, provider, model = parts
+            if model_type in configured_model_types:
+                raise ValueError(f"NEW_USER_DEFAULT_MODELS contains duplicate model type: {model_type}")
+
+            configured_model_types.add(model_type)
+            default_models.append((model_type, provider, model))
+
+        return default_models
+
 
 class MarketplaceConfig(BaseSettings):
     """
@@ -784,6 +820,11 @@ class WorkflowConfig(BaseSettings):
         default=500,
     )
 
+    WORKFLOW_GENERATOR_NODE_BUILDER_MAX_WORKERS: PositiveInt = Field(
+        description="Maximum concurrent node-builder LLM calls per workflow generation request",
+        default=6,
+    )
+
     WORKFLOW_MAX_EXECUTION_TIME: PositiveInt = Field(
         description="Maximum execution time in seconds for a single workflow",
         default=1200,

api/controllers/console/app/workflow.py

@@ -58,6 +58,7 @@ from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory, variable_factory
 from fields.base import ResponseModel
+from fields.conversation_variable_fields import WorkflowConversationVariableResponse
 from fields.member_fields import SimpleAccount
 from fields.workflow_run_fields import WorkflowRunNodeExecutionResponse
 from graphon.enums import NodeType
@@ -238,21 +239,6 @@ class WorkflowOnlineUsersPayload(BaseModel):
         return list(dict.fromkeys(app_id.strip() for app_id in app_ids if app_id.strip()))
 
 
-class WorkflowConversationVariableResponse(ResponseModel):
-    id: str
-    name: str
-    value_type: str
-    value: Any
-    description: str
-
-    @field_validator("value_type", mode="before")
-    @classmethod
-    def _serialize_value_type(cls, value: Any) -> str:
-        if hasattr(value, "exposed_type"):
-            return str(value.exposed_type())
-        return str(value)
-
-
 class PipelineVariableResponse(ResponseModel):
     label: str
     variable: str

api/controllers/console/auth/forgot_password.py

@@ -16,7 +16,6 @@ from controllers.console.auth.error import (
 )
 from controllers.console.error import AccountNotFound, EmailSendIpLimitError
 from controllers.console.wraps import email_password_login_enabled, setup_required
-from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.helper import EmailStr, extract_remote_ip
 from libs.password import hash_password
@@ -201,7 +200,4 @@ class ForgotPasswordResetApi(Resource):
             not TenantService.get_join_tenants(account, session=db.session())
             and FeatureService.get_system_features().is_allow_create_workspace
         ):
-            tenant = TenantService.create_tenant(f"{account.name}'s Workspace", session=db.session())
-            TenantService.create_tenant_member(tenant, account, db.session(), role="owner")
-            account.set_current_tenant_with_session(tenant, session=db.session())
-            tenant_was_created.send(tenant)
+            TenantService.create_owner_tenant(account, session=db.session())

api/controllers/console/auth/login.py

@@ -42,7 +42,6 @@ from controllers.console.wraps import (
     setup_required,
     with_current_user,
 )
-from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.helper import EmailStr, extract_remote_ip
 from libs.helper import timezone as validate_timezone_string
@@ -317,10 +316,7 @@ class EmailCodeLoginApi(Resource):
                 if not FeatureService.get_system_features().is_allow_create_workspace:
                     raise NotAllowedCreateWorkspace()
                 else:
-                    new_tenant = TenantService.create_tenant(f"{account.name}'s Workspace", session=db.session())
-                    TenantService.create_tenant_member(new_tenant, account, db.session(), role="owner")
-                    account.set_current_tenant_with_session(new_tenant, session=db.session())
-                    tenant_was_created.send(new_tenant)
+                    TenantService.create_owner_tenant(account, session=db.session())
 
         if account is None:
             try:

api/controllers/console/auth/oauth.py

@@ -11,7 +11,6 @@ from configs import dify_config
 from constants.languages import languages
 from controllers.common.fields import RedirectResponse
 from controllers.common.schema import query_params_from_model, register_response_schema_model, register_schema_models
-from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_remote_ip
@@ -282,10 +281,7 @@ def _generate_account(
             if not FeatureService.get_system_features().is_allow_create_workspace:
                 raise WorkSpaceNotAllowedCreateError()
             else:
-                new_tenant = TenantService.create_tenant(f"{account.name}'s Workspace", session=db.session())
-                TenantService.create_tenant_member(new_tenant, account, db.session(), role="owner")
-                account.set_current_tenant_with_session(new_tenant, session=db.session())
-                tenant_was_created.send(new_tenant)
+                TenantService.create_owner_tenant(account, session=db.session())
 
     if not account:
         normalized_email = user_info.email.lower()

api/controllers/console/explore/trial.py

@@ -60,6 +60,7 @@ from core.errors.error import (
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from fields.base import ResponseModel
+from fields.conversation_variable_fields import WorkflowConversationVariableResponse
 from fields.message_fields import SuggestedQuestionsResponse
 from graphon.graph_engine.manager import GraphEngineManager
 from graphon.model_runtime.errors.invoke import InvokeError
@@ -373,7 +374,7 @@ class TrialWorkflowResponse(ResponseModel):
     updated_at: int | None = None
     tool_published: bool | None = None
     environment_variables: list[JsonObject] = Field(default_factory=list)
-    conversation_variables: list[JsonObject] = Field(default_factory=list)
+    conversation_variables: list[WorkflowConversationVariableResponse] = Field(default_factory=list)
     rag_pipeline_variables: list[JsonObject] = Field(default_factory=list)
 
     @field_validator("created_at", "updated_at", mode="before")

api/controllers/console/workspace/workspace.py

@@ -88,6 +88,7 @@ class TenantInfoResponse(ResponseModel):
     custom_config: WorkspaceCustomConfigResponse | None = None
     trial_credits: int | None = None
     trial_credits_used: int | None = None
+    trial_credits_exhausted_at: int | None = None
     next_credit_reset_date: int | None = None
 
     @field_validator("plan", "status", "trial_end_reason", mode="before")

api/controllers/inner_api/workspace/workspace.py

@@ -47,10 +47,12 @@ class EnterpriseWorkspace(Resource):
         if account is None:
             return {"message": "owner account not found."}, 404
 
-        tenant = TenantService.create_tenant(args.name, is_from_dashboard=True, session=db.session())
-        TenantService.create_tenant_member(tenant, account, db.session(), role="owner")
-
-        tenant_was_created.send(tenant)
+        tenant = TenantService.create_owner_tenant(
+            account,
+            name=args.name,
+            is_from_dashboard=True,
+            session=db.session(),
+        )
 
         resp = {
             "id": tenant.id,

api/core/app/apps/advanced_chat/app_generator.py

@@ -242,6 +242,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
                 workflow_triggered_from = WorkflowRunTriggeredFrom.APP_RUN
             workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=session_factory,
+                tenant_id=app_model.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=workflow_triggered_from,
@@ -249,6 +250,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
             # Create workflow node execution repository
             workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                 session_factory=session_factory,
+                tenant_id=app_model.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -375,6 +377,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         # Create workflow execution(aka workflow run) repository
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -382,6 +385,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         # Create workflow node execution repository
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -466,6 +470,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         # Create workflow execution(aka workflow run) repository
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -473,6 +478,7 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         # Create workflow node execution repository
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,

api/core/app/apps/pipeline/pipeline_generator.py

@@ -216,6 +216,7 @@ class PipelineGenerator(BaseAppGenerator):
             session_factory = sessionmaker(bind=db.engine, expire_on_commit=False)
             workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=session_factory,
+                tenant_id=pipeline.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=workflow_triggered_from,
@@ -223,6 +224,7 @@ class PipelineGenerator(BaseAppGenerator):
 
             workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                 session_factory=session_factory,
+                tenant_id=pipeline.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.RAG_PIPELINE_RUN,
@@ -425,6 +427,7 @@ class PipelineGenerator(BaseAppGenerator):
 
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=pipeline.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.RAG_PIPELINE_DEBUGGING,
@@ -432,6 +435,7 @@ class PipelineGenerator(BaseAppGenerator):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=pipeline.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -524,6 +528,7 @@ class PipelineGenerator(BaseAppGenerator):
 
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=pipeline.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.RAG_PIPELINE_DEBUGGING,
@@ -531,6 +536,7 @@ class PipelineGenerator(BaseAppGenerator):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=pipeline.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,

api/core/app/apps/workflow/app_generator.py

@@ -243,6 +243,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
                 workflow_triggered_from = WorkflowRunTriggeredFrom.APP_RUN
             workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=session_factory,
+                tenant_id=app_model.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=workflow_triggered_from,
@@ -250,6 +251,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
             # Create workflow node execution repository
             workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                 session_factory=session_factory,
+                tenant_id=app_model.tenant_id,
                 user=user,
                 app_id=application_generate_entity.app_config.app_id,
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -470,6 +472,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
         # Create workflow execution(aka workflow run) repository
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -477,6 +480,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
         # Create workflow node execution repository
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -560,6 +564,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
         # Create workflow execution(aka workflow run) repository
         workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -567,6 +572,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
         # Create workflow node execution repository
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=app_model.tenant_id,
             user=user,
             app_id=application_generate_entity.app_config.app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,

api/core/llm_generator/llm_generator.py

@@ -403,55 +403,6 @@ class LLMGenerator:
             return ""
         return "\n\n".join(sections) + "\n\n"
 
-    @classmethod
-    def classify_workflow_mode(
-        cls,
-        tenant_id: str,
-        instruction: str,
-        model_config: ModelConfig,
-    ) -> Literal["workflow", "advanced-chat"]:
-        """Classify a free-text instruction into a concrete app mode.
-
-        One tiny LLM call using the model the user already picked (so no extra
-        provider setup is needed). Parsed leniently; defaults to
-        ``advanced-chat`` on anything unexpected or any error, so a
-        ``mode="auto"`` request never blocks generation. NEVER raises.
-        """
-        default_mode: Literal["workflow", "advanced-chat"] = "advanced-chat"
-        try:
-            model_instance = ModelManager.for_tenant(tenant_id=tenant_id).get_model_instance(
-                tenant_id=tenant_id,
-                model_type=ModelType.LLM,
-                provider=model_config.provider,
-                model=model_config.name,
-            )
-            prompt_messages: list[PromptMessage] = [
-                UserPromptMessage(
-                    content=(
-                        "Reply with exactly one word: 'workflow' (one-shot automation, no chat) "
-                        "or 'advanced-chat' (conversational multi-turn). "
-                        f"Instruction: {instruction.strip()}"
-                    )
-                ),
-            ]
-            response: LLMResult = model_instance.invoke_llm(
-                prompt_messages=prompt_messages,
-                model_parameters={"max_tokens": 4, "temperature": 0},
-                stream=False,
-            )
-            text = (response.message.get_text_content() or "").strip().lower()
-        except Exception:
-            logger.info("Workflow mode classification failed; defaulting to %s", default_mode, exc_info=True)
-            return default_mode
-
-        # Lenient parse: an affirmative "workflow" wins; everything else
-        # (including a truncated / empty / garbled reply) falls back to the
-        # conversational default. "advanced-chat" needs no positive match
-        # because it IS the default.
-        if "workflow" in text:
-            return "workflow"
-        return default_mode
-
     @classmethod
     def generate_rule_config(cls, tenant_id: str, args: RuleGeneratePayload):
         output_parser = RuleConfigGeneratorOutputParser()

api/core/repositories/celery_workflow_execution_repository.py

@@ -13,7 +13,6 @@ from sqlalchemy.orm import sessionmaker
 
 from core.repositories.factory import WorkflowExecutionRepository
 from graphon.entities import WorkflowExecution
-from libs.helper import extract_tenant_id
 from models import Account, CreatorUserRole, EndUser
 from models.enums import WorkflowRunTriggeredFrom
 from tasks.workflow_execution_tasks import (
@@ -47,6 +46,7 @@ class CeleryWorkflowExecutionRepository(WorkflowExecutionRepository):
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowRunTriggeredFrom | None,
@@ -56,7 +56,8 @@ class CeleryWorkflowExecutionRepository(WorkflowExecutionRepository):
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for fallback operations
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (DEBUGGING or APP_RUN)
         """
@@ -71,10 +72,8 @@ class CeleryWorkflowExecutionRepository(WorkflowExecutionRepository):
                     f"Invalid session_factory type {type(session_factory).__name__}; expected sessionmaker or Engine"
                 )
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context

api/core/repositories/celery_workflow_node_execution_repository.py

@@ -17,7 +17,6 @@ from core.repositories.factory import (
     WorkflowNodeExecutionRepository,
 )
 from graphon.entities import WorkflowNodeExecution
-from libs.helper import extract_tenant_id
 from models import Account, CreatorUserRole, EndUser
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 from tasks.workflow_node_execution_tasks import (
@@ -54,6 +53,7 @@ class CeleryWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowNodeExecutionTriggeredFrom | None,
@@ -63,7 +63,8 @@ class CeleryWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for fallback operations
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow node execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (SINGLE_STEP or WORKFLOW_RUN)
         """
@@ -78,10 +79,8 @@ class CeleryWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
                     f"Invalid session_factory type {type(session_factory).__name__}; expected sessionmaker or Engine"
                 )
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context

api/core/repositories/factory.py

@@ -62,6 +62,7 @@ class DifyCoreRepositoryFactory:
     def create_workflow_execution_repository(
         cls,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str,
         triggered_from: WorkflowRunTriggeredFrom,
@@ -71,7 +72,8 @@ class DifyCoreRepositoryFactory:
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine
-            user: Account or EndUser object
+            tenant_id: Tenant that owns the workflow execution
+            user: Account or EndUser used for creator attribution
             app_id: Application ID
             triggered_from: Source of the execution trigger
 
@@ -87,6 +89,7 @@ class DifyCoreRepositoryFactory:
             repository_class = import_string(class_path)
             return repository_class(
                 session_factory=session_factory,
+                tenant_id=tenant_id,
                 user=user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -98,6 +101,7 @@ class DifyCoreRepositoryFactory:
     def create_workflow_node_execution_repository(
         cls,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str,
         triggered_from: WorkflowNodeExecutionTriggeredFrom,
@@ -107,7 +111,8 @@ class DifyCoreRepositoryFactory:
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine
-            user: Account or EndUser object
+            tenant_id: Tenant that owns the workflow node execution
+            user: Account or EndUser used for creator attribution
             app_id: Application ID
             triggered_from: Source of the execution trigger
 
@@ -123,6 +128,7 @@ class DifyCoreRepositoryFactory:
             repository_class = import_string(class_path)
             return repository_class(
                 session_factory=session_factory,
+                tenant_id=tenant_id,
                 user=user,
                 app_id=app_id,
                 triggered_from=triggered_from,

api/core/repositories/sqlalchemy_workflow_execution_repository.py

@@ -13,7 +13,6 @@ from core.repositories.factory import WorkflowExecutionRepository
 from graphon.entities import WorkflowExecution
 from graphon.enums import WorkflowExecutionStatus, WorkflowType
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from libs.helper import extract_tenant_id
 from models import (
     Account,
     CreatorUserRole,
@@ -40,6 +39,7 @@ class SQLAlchemyWorkflowExecutionRepository(WorkflowExecutionRepository):
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowRunTriggeredFrom | None,
@@ -49,7 +49,8 @@ class SQLAlchemyWorkflowExecutionRepository(WorkflowExecutionRepository):
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for creating sessions
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (DEBUGGING or APP_RUN)
         """
@@ -64,10 +65,8 @@ class SQLAlchemyWorkflowExecutionRepository(WorkflowExecutionRepository):
                     f"Invalid session_factory type {type(session_factory).__name__}; expected sessionmaker or Engine"
                 )
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context

api/core/repositories/sqlalchemy_workflow_node_execution_repository.py

@@ -23,7 +23,6 @@ from graphon.entities import WorkflowNodeExecution
 from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.model_runtime.utils.encoders import jsonable_encoder
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from libs.helper import extract_tenant_id
 from libs.uuid_utils import uuidv7
 from models import (
     Account,
@@ -63,6 +62,7 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowNodeExecutionTriggeredFrom | None,
@@ -72,7 +72,8 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for creating sessions
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow node execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (SINGLE_STEP or WORKFLOW_RUN)
         """
@@ -87,10 +88,8 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
                     f"Invalid session_factory type {type(session_factory).__name__}; expected sessionmaker or Engine"
                 )
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context
@@ -299,6 +298,7 @@ class SQLAlchemyWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository)
             content=value_json.encode("utf-8"),
             mimetype="application/json",
             user=self._user,
+            tenant_id=self._tenant_id,
         )
         offload = WorkflowNodeExecutionOffload(
             id=uuidv7(),

api/core/workflow/generator/__init__.py

@@ -4,12 +4,12 @@ Workflow generator package.
 Generates a Dify workflow graph (nodes, edges, viewport) from a natural-language
 instruction. Intended for the cmd+k `/create` slash command's preview/apply flow.
 
-Pipeline (slim, single-shot variant):
+Pipeline:
 
     runner.WorkflowGenerator.generate_workflow_graph(...)
-        ├── planner_prompts: short LLM call → high-level node plan
-        └── builder_prompts: structured-output LLM call → full graph JSON
-            └── postprocess: fill defaults, auto-layout viewport, sanity-check edges
+        ├── planner_prompts: short LLM call → node and edge plan
+        ├── node_builder_prompts: bounded parallel calls → semantic node configs
+        └── postprocess: assemble wrappers, auto-layout, validate graph
 
 The runner is pure domain logic; ``WorkflowGeneratorService`` (in ``services/``)
 owns the model-manager dependency and is what controllers call.

api/core/workflow/generator/prompts/builder_prompts.py

@@ -1,19 +1,4 @@
-"""
-Builder prompts.
-
-The builder is the second step of the slim planner→builder pipeline. It takes
-the planner's high-level node list and emits the *full* graph JSON consumed by
-``WorkflowService.sync_draft_workflow``.
-
-The builder owns: node configuration (prompts, code, headers, etc.), edge wiring,
-handle ids ("source"/"target"), positions, and the viewport. It is the only
-prompt that needs to know the concrete shape of each node type — keep its
-examples accurate or the LLM will invent fields.
-"""
-
-import json
-from collections.abc import Iterable
-from typing import Any
+"""Compact semantic configuration references for workflow node builders."""
 
 # Per-node-type configuration cheatsheet.
 #
@@ -23,50 +8,9 @@ from typing import Any
 # both ``WorkflowService.sync_draft_workflow``'s structural checks and the
 # runtime entity validation each node performs when the workflow runs.
 #
-# The cheatsheet is assembled DYNAMICALLY per request: the planner decides
-# which node types the workflow needs, and ``build_node_config_cheatsheet``
-# stitches together only the snippets for those types (plus the always-needed
-# wrapper / shared-field / edge-handle preamble, and the containers section
-# when an iteration / loop is planned). This keeps the builder prompt tight —
-# a 3-node summariser no longer carries the schema for 12 unrelated node
-# types — and lets each snippet document its FULL schema (e.g. a "file" start
-# variable's required ``allowed_file_types``) without bloating every prompt.
-#
-# The postprocessor in ``runner.py`` fills missing wrapper fields (``type``,
-# ``positionAbsolute``, ``width``, ``height``, ``sourcePosition`` /
-# ``targetPosition``, edge ``data.sourceType`` / ``data.targetType``), so the
-# LLM only needs to emit semantically meaningful fields.
-
-# Always-included preamble: the node/edge wrapper shape and the shared
-# ``data`` fields that apply to every node type, plus the "## Per type" header
-# the per-type snippets slot under.
-_CHEATSHEET_PREAMBLE = """\
-## Node wrapper (every node, top-level)
-
-    {"id": "node1" (digits + letters only — see "Node IDs" below),
-     "type": "custom",                # ReactFlow renderer key. Iteration/loop
-                                      # *start* children use special types
-                                      # (see Containers below).
-     "position": {"x": <number>, "y": <number>},
-     "data": { ... per-type fields ... }}
-
-Children of iteration / loop containers additionally need
-``parentId``, ``zIndex: 1002`` and ``extent: "parent"`` — see Containers.
-
-## Shared "data" fields (every node)
-
-    {"type": "<node-type>",          # e.g. "llm", "start", "if-else"
-     "title": "<short label>",
-     "desc": "<one-liner>",
-     "selected": false}
-
-## Per type — additional "data" fields (only the node types in your plan are shown)"""
-
-
-# node_type → its per-type schema snippet. Keyed by the exact ``node_type``
-# string the planner emits so ``build_node_config_cheatsheet`` can look each
-# one up directly. Iteration / loop are documented in the Containers section
-# (they are subgraphs, not leaf nodes) rather than here.
+# Each snippet mirrors the production node default closely enough for one
+# model call to emit only meaningful ``data`` fields. The runner owns wrappers,
+# topology, container metadata, layout, and validation.
 _NODE_SNIPPETS: dict[str, str] = {
     "start": """\
 - start:
@@ -248,484 +192,30 @@ _NODE_SNIPPETS: dict[str, str] = {
     Enable only the sub-features you need; ``conditions`` reuse the if-else
     condition shape (key / comparison_operator / value). Outputs: ``result``
     (the processed array), ``first_record``, ``last_record``.""",
+    "assigner": """\
+- assigner  (write to an existing conversation / loop variable):
+    {"version": "2",
+     "items": [{"variable_selector": ["<target-node>", "<target-var>"],
+                "input_type": "variable",
+                "operation": "over-write",
+                "value": ["<source-node>", "<source-var>"]}]}
+    ``input_type`` is "variable" (value is a selector) or "constant".
+    Operations: over-write | clear | append | extend | set | += | -= | *= |
+    /= | remove-first | remove-last.""",
+    "human-input": """\
+- human-input  (pause for a person; use webapp delivery by default):
+    {"delivery_methods": [{"id": "webapp", "type": "webapp", "enabled": true}],
+     "form_content": "<short review / approval instructions>",
+     "inputs": [{"type": "paragraph", "output_variable_name": "comment",
+                 "default": {"type": "constant", "selector": [], "value": ""}}],
+     "user_actions": [{"id": "approve", "title": "Approve",
+                       "button_style": "primary"}],
+     "timeout": 3, "timeout_unit": "day"}
+    Each ``inputs[].output_variable_name`` is an output variable. Outgoing
+    edges use the matching user-action id as ``sourceHandle``.""",
 }
 
 
-# Pulled into the cheatsheet only when an iteration / loop appears in the plan.
-_CONTAINERS_SECTION = """\
-## Containers — iteration / loop
-
-These are SUBGRAPH nodes. To use one you MUST emit, in order:
-
-1. The container node itself, e.g. for iteration:
-       id: "nodeK"
-       type: "custom"
-       data: {"type": "iteration",
-              "title": "<label>",
-              "desc": "",
-              "selected": false,
-              "start_node_id": "nodeKstart",
-              "iterator_selector": ["<src>", "<list-var>"],
-              "output_selector": ["<inner-last-node>", "<out-var>"],
-              "is_parallel": false,
-              "parallel_nums": 10,
-              "error_handle_mode": "terminated",
-              "flatten_output": true}
-       width: 808
-       height: 204
-       zIndex: 1
-
-   For loop, swap "iteration" → "loop" and use:
-       data: {"type": "loop", "title": "...", "desc": "",
-              "selected": false, "start_node_id": "nodeKstart",
-              "break_conditions": [], "loop_count": 10,
-              "logical_operator": "and"}
-
-2. The auto-start child (one per container):
-       id: "nodeKstart"
-       type: "custom-iteration-start"          # loop → "custom-loop-start"
-       parentId: "nodeK"
-       extent: "parent"
-       draggable: false
-       selectable: false
-       zIndex: 1002
-       position: {"x": 60, "y": 78}            # relative to parent
-       data: {"type": "iteration-start",       # loop → "loop-start"
-              "title": "", "desc": "",
-              "isInIteration": true,           # loop → "isInLoop": true
-              "selected": false}
-
-3. Each inner-pipeline node (any node type, follows normal data rules) MUST add:
-       parentId: "nodeK"
-       extent: "parent"
-       zIndex: 1002
-       position: {x, y}                         # relative to parent
-       data: {..., "isInIteration": true,       # loop → "isInLoop": true
-              "iteration_id": "nodeK"}         # loop → "loop_id"
-
-4. Edges INSIDE a container must add to ``data``:
-       "isInIteration": true                    # loop → "isInLoop": true
-       "iteration_id": "nodeK"                 # loop → "loop_id"
-   and use ``zIndex: 1002``. Edges OUTSIDE containers use the default
-   ``isInIteration: false`` / ``isInLoop: false``.
-
-5. The container's incoming/outgoing edges connect to the container's id
-   (``nodeK``), NOT to inner nodes. The first inner edge connects from
-   ``nodeKstart``."""
-
-
-# Always-included trailer: edge handle conventions for every graph.
-_EDGE_HANDLES_SECTION = """\
-## Edge handles
-
-- Most nodes:           sourceHandle "source", targetHandle "target".
-- if-else cases:        sourceHandle is the case_id ("true" / "false" / ...).
-- question-classifier:  sourceHandle is the class_id ("1" / "2" / ...).
-- iteration-start /     sourceHandle "source"; the edge from the *start node
-  loop-start:           is what kicks off the first inner step."""
-
-
-# Container node types are described in ``_CONTAINERS_SECTION`` rather than as
-# leaf snippets; their presence in a plan pulls that section in.
-_CONTAINER_NODE_TYPES = frozenset({"iteration", "loop"})
-
-
-def build_node_config_cheatsheet(node_types: Iterable[str] | None = None) -> str:
-    """
-    Assemble the builder cheatsheet for exactly the node types in the plan.
-
-    ``node_types`` is the set of ``node_type`` strings the planner chose. We
-    emit the always-on preamble (wrapper / shared fields), then only the
-    per-type snippets for the requested types (``start`` is always included —
-    every graph has one), the Containers section when an iteration / loop is
-    planned, and the edge-handles trailer. Unknown / unrecognised type strings
-    are ignored (the runtime / structural validator catches genuinely bogus
-    types).
-
-    ``None`` returns the FULL cheatsheet (every snippet + containers) — used to
-    build the static back-compat constants below and as a safe fallback.
-    """
-    if node_types is None:
-        requested: set[str] = set(_NODE_SNIPPETS) | set(_CONTAINER_NODE_TYPES)
-    else:
-        requested = {str(t).strip() for t in node_types if str(t).strip()}
-        requested.add("start")  # every workflow has exactly one start node
-
-    parts: list[str] = [_CHEATSHEET_PREAMBLE]
-    # Iterate _NODE_SNIPPETS (not ``requested``) to keep a stable, readable order.
-    parts.extend(snippet for node_type, snippet in _NODE_SNIPPETS.items() if node_type in requested)
-    if requested & _CONTAINER_NODE_TYPES:
-        parts.append(_CONTAINERS_SECTION)
-    parts.append(_EDGE_HANDLES_SECTION)
-    return "\n\n".join(parts) + "\n"
-
-
-# Full cheatsheet (all node types) — retained as a module constant so callers
-# and tests that want the complete reference can import it directly. The
-# dynamic per-request prompt is built by ``get_builder_system_prompt``.
-NODE_CONFIG_CHEATSHEET = build_node_config_cheatsheet()
-
-
-_BASE_SYSTEM_PROMPT_HEAD = """You are a Dify workflow builder.
-
-You are given:
-  1. A user instruction (what the workflow should do).
-  2. A node plan from the planner (which nodes to use, in execution order).
-
-Your job: emit a complete Dify workflow graph as JSON. The graph will be written
-directly into a Studio draft, so it must be syntactically valid and structurally
-correct.
-
-# Hard rules
-
-1. The output is a single JSON object — no prose, no Markdown, no code fences.
-2. NODE IDs MUST USE ONLY ALPHANUMERICS + UNDERSCORES — never hyphens.
-   Dify's run-time placeholder regex (see ``variable_pool.VARIABLE_PATTERN``)
-   is ``\\{\\{#([a-zA-Z0-9_]{1,50}(?:\\.[a-zA-Z_][a-zA-Z0-9_]{0,29}){1,10})#\\}\\}``,
-   so any placeholder pointing at a hyphenated id (e.g. ``{{#node-1.text#}}``)
-   silently fails to match at run time and the literal string survives into
-   the prompt — the user then sees ``{{#node-1.text#}}`` in their output.
-   Use the EXACT ids from the plan, formatted as ``node1``, ``node2``, ... in
-   plan order. Edge ``source`` / ``target`` must reference these ids.
-3. Every node has top-level fields: id, type, position, data.
-   - "type" is always "custom" (ReactFlow node renderer).
-   - "data.type" is the actual node type ("llm", "start", etc.).
-4. Every edge has top-level fields: id, source, target, type, sourceHandle, targetHandle.
-   - "type" is always "custom".
-   - "sourceHandle"/"targetHandle" follow the cheatsheet (default: "source"/"target").
-   - Edge id format: "<source>-<sourceHandle>-<target>-<targetHandle>".
-5. Use the model from the planner context for ALL "llm" / "question-classifier" /
-   "parameter-extractor" nodes (provider, name, mode, completion_params).
-6. Reference upstream outputs with the literal placeholder syntax
-   ``{{#<node-id>.<output-var>#}}`` — that's DOUBLE curly braces with ``#``
-   markers inside (matching Dify's runtime placeholder regex
-   ``\\{\\{#[^#]+#\\}\\}``). NEVER emit single-brace ``{#…#}`` — Dify will
-   not interpolate it, so the LLM at run time would see the literal
-   placeholder string in its prompt and echo it back as output. Use
-   ``["<node-id>", "<output-var>"]`` for ``value_selector`` /
-   ``query_variable_selector`` / etc.
-7. The "start" node owns input variables; downstream nodes reference them as
-   ``["<start-node-id>", "<var-name>"]`` for selectors or
-   ``{{#<start-node-id>.<var-name>#}}`` inside prompt strings.
-8. NEVER emit "code" or "http-request" nodes if a tool from the "Available tools"
-   section below covers the same task — replace them with a "tool" node referencing
-   the exact provider/tool identifier from the catalogue. "code" / "http-request"
-   are last-resort escape hatches for arbitrary transformations and APIs that no
-   installed tool can express.
-9. EVERY variable reference MUST resolve to a real, declared variable on the
-   source node — never invent a variable name. Specifically:
-   - ``{{#<node-id>.<var>#}}`` inside a prompt / ``answer`` / ``template-transform``
-     template (DOUBLE braces — single ``{#…#}`` is NOT a Dify placeholder
-     and will NOT be substituted), AND ``["<node-id>", "<var>"]`` inside a
-     ``value_selector`` /
-     ``query_variable_selector`` / ``iterator_selector`` / ``output_selector`` /
-     ``tool_parameters[*].value`` (when ``type: "variable"``), MUST point at a
-     value that the source node actually exposes:
-       * ``start``  → one of the ``data.variables[*].variable`` entries you
-         declared on the start node. Add an entry if you need a new input.
-       * ``llm``    → ``text`` (the default LLM output) or, when structured
-         output is enabled, a key from its schema.
-       * ``code``   → a key in ``data.outputs``.
-       * ``knowledge-retrieval`` → ``result`` (the standard array output).
-       * ``parameter-extractor`` → one of the ``data.parameters[*].name``.
-       * ``document-extractor`` → ``text`` (extracted file text; an array of
-         strings when ``is_array_file`` is true).
-       * ``variable-aggregator`` → ``output``.
-       * ``list-operator`` → ``result`` (array), ``first_record``,
-         ``last_record``.
-       * ``tool``   → any parameter declared by the tool — the run time
-         validates these, so you can name them freely, but pick from the
-         documented provider/tool.
-     If the planner's "Start inputs" list (see user prompt) is non-empty,
-     copy each entry verbatim into ``start.data.variables`` so the
-     downstream references resolve.
-   - In Advanced-Chat mode you may also reference ``sys.query`` and
-     ``sys.files`` without declaring them. In selector fields, spell these as
-     exactly ``["sys", "query"]`` and ``["sys", "files"]`` — never as a
-     one-item array such as ``["sys,query"]`` or ``["sys.query"]``.
-10. MULTIPLE KNOWLEDGE-RETRIEVAL INPUTS TO ONE LLM require a template fan-in.
-    ``context.variable_selector accepts only one selector`` and therefore
-    cannot carry two retrieval outputs. When an LLM must synthesize two or
-    more retrieval results:
-    - Run the retrieval nodes as parallel siblings from the same query input.
-    - Add one ``template-transform`` node after them. Give it one variable per
-      retrieval, such as ``value_selector: ["node2", "result"]`` and
-      ``value_selector: ["node3", "result"]``, and render every source's
-      content into one labelled text output.
-    - Add an edge from EACH retrieval node to the template, then one edge from
-      the template to the LLM. The LLM must NOT receive direct retrieval edges.
-    - Enable the LLM's context, set ``context.variable_selector`` to the
-      template's ``["<template-node-id>", "output"]``, and put
-      ``{{#context#}}`` in its prompt.
-    - Do not use ``variable-aggregator`` for this: it selects the first value
-      produced by mutually exclusive branches; it does not concatenate two
-      retrieval results that both ran.
-
-"""
-
-
-_BASE_SYSTEM_PROMPT_TAIL = """\
-
-# Layout
-
-- Place nodes left-to-right with x=80 + 320 * index, y=280.
-- Viewport: {"x": 0, "y": 0, "zoom": 0.7}.
-
-"""
-
-
-_BASE_SYSTEM_PROMPT_FOOTER = """
-
-# Output schema
-
-{
-  "nodes": [...],
-  "edges": [...],
-  "viewport": {"x": 0, "y": 0, "zoom": 0.7}
-}
-"""
-
-
-_WORKFLOW_MODE_RULES = """# Mode-specific rules — Workflow
-
-- The graph MUST start with exactly one "start" node and end with exactly one "end" node.
-- Do NOT use "answer" nodes (those are for Advanced Chat only).
-- The "end" node's outputs[].value_selector must point at a real upstream output.
-"""
-
-
-_ADVANCED_CHAT_MODE_RULES = """# Mode-specific rules — Advanced Chat (Chatflow)
-
-- The graph MUST start with exactly one "start" node and end with exactly one "answer" node.
-- Do NOT use "end" nodes (those are for plain Workflow apps).
-- The "start" node should expose "sys.query" / "sys.files" automatically; user-defined
-  variables go in start.data.variables.
-- The "answer" node's "answer" field references upstream outputs as
-  {{#<node-id>.<var>#}} and is what the user sees in chat.
-"""
-
-
-def _assemble_builder_system_prompt(mode: str, node_types: Iterable[str] | None) -> str:
-    """Stitch the builder system prompt for ``mode`` around a cheatsheet built
-    for ``node_types`` (``None`` → full cheatsheet)."""
-    mode_rules = _ADVANCED_CHAT_MODE_RULES if mode == "advanced-chat" else _WORKFLOW_MODE_RULES
-    return (
-        _BASE_SYSTEM_PROMPT_HEAD
-        + mode_rules
-        + _BASE_SYSTEM_PROMPT_TAIL
-        + build_node_config_cheatsheet(node_types)
-        + _BASE_SYSTEM_PROMPT_FOOTER
-    )
-
-
-# Static full-cheatsheet prompts — the back-compat default returned by
-# ``get_builder_system_prompt`` when the caller doesn't pin a node-type set.
-BUILDER_SYSTEM_PROMPT_WORKFLOW = _assemble_builder_system_prompt("workflow", None)
-
-BUILDER_SYSTEM_PROMPT_ADVANCED_CHAT = _assemble_builder_system_prompt("advanced-chat", None)
-
-
-BUILDER_USER_PROMPT = """# User instruction
-
-{instruction}
-
-{ideal_output_section}\
-{existing_graph_section}\
-# Selected model (use for all LLM-based nodes)
-
-provider={provider}, name={name}, mode={mode_label}
-
-{tool_catalogue_section}\
-{start_inputs_section}\
-# Node plan (from planner — use these labels and node_types in this order)
-
-{plan_block}
-
-Now emit the complete workflow graph JSON.
-"""
-
-
-# Node wrapper fields that carry no meaning the builder needs: pure canvas /
-# selection state, plus geometry the runner's postprocess recomputes anyway.
-# Stripping them out of the refine prompt cuts its size roughly in half on
-# hand-edited graphs — fewer tokens in, and (because the builder echoes
-# untouched nodes verbatim) far fewer tokens out, which is where the latency
-# lives.
-_PRUNED_NODE_KEYS = frozenset(
-    {
-        "positionAbsolute",
-        "sourcePosition",
-        "targetPosition",
-        "selected",
-        "dragging",
-        "measured",
-    }
-)
-
-# Additionally pruned from TOP-LEVEL nodes only: the layered auto-layout
-# recomputes their position and size defaults, so the builder never needs to
-# reproduce them. Container children keep ``position`` (relative to the
-# parent, which we cannot recompute) and containers keep ``width`` /
-# ``height`` (their canvas size is real config, not a default).
-_PRUNED_TOP_LEVEL_NODE_KEYS = _PRUNED_NODE_KEYS | {"position", "width", "height"}
-
-_CONTAINER_DATA_TYPES = frozenset({"iteration", "loop"})
-
-# Edge fields the builder must echo; everything else (ids, zIndex,
-# sourceType / targetType, isInIteration / isInLoop markers) is recomputed
-# by the runner's postprocess from the node topology.
-_KEPT_EDGE_KEYS = ("source", "target", "sourceHandle", "targetHandle")
-
-
-def compact_graph_for_builder(current_graph: dict) -> dict:
-    """
-    Strip canvas noise out of a draft graph before prompt injection.
-
-    Keeps everything semantically meaningful — ids, wrapper ``type``,
-    ``parentId``, the full ``data`` config, child positions, container
-    sizes — and drops geometry / selection state the postprocess pass
-    recomputes. The builder echoes untouched nodes verbatim, so every byte
-    removed here is removed twice (prompt AND completion).
-    """
-    nodes_out: list[dict] = []
-    for node in current_graph.get("nodes") or []:
-        if not isinstance(node, dict):
-            continue
-        is_child = bool(node.get("parentId"))
-        is_container = isinstance(node.get("data"), dict) and node["data"].get("type") in _CONTAINER_DATA_TYPES
-        pruned = _PRUNED_NODE_KEYS if (is_child or is_container) else _PRUNED_TOP_LEVEL_NODE_KEYS
-        compact = {k: v for k, v in node.items() if k not in pruned}
-        if is_container:
-            # Container position is still recomputed by the layout pass.
-            compact.pop("position", None)
-        nodes_out.append(compact)
-    edges_out = [
-        {k: edge[k] for k in _KEPT_EDGE_KEYS if k in edge}
-        for edge in (current_graph.get("edges") or [])
-        if isinstance(edge, dict)
-    ]
-    return {"nodes": nodes_out, "edges": edges_out}
-
-
-def format_builder_existing_graph_section(current_graph: dict | None) -> str:
-    """
-    Refine mode: give the builder the existing graph JSON so it can keep
-    every node and edge the user's change does not touch byte-for-byte — same
-    ids, same config, same prompt templates. Without the full config the
-    builder would regenerate untouched nodes from scratch and silently drop
-    the user's hand-tuned settings. Canvas-only fields are stripped first
-    (see ``compact_graph_for_builder``) — they're recomputed in postprocess,
-    so carrying them only slows the call down.
-
-    Returns an empty string in create mode (no ``current_graph``); the builder
-    then behaves exactly as before, constructing the graph purely from the
-    planner's node plan.
-    """
-    if not current_graph:
-        return ""
-    graph_json = json.dumps(compact_graph_for_builder(current_graph), ensure_ascii=False, separators=(",", ":"))
-    return (
-        "# Existing graph to refine (JSON)\n\n"
-        "You are REFINING this existing graph, NOT building from scratch. Apply "
-        "ONLY the change the user instruction describes. Every node and edge the "
-        "change does not affect MUST be preserved verbatim — keep the same node "
-        "ids, the same `data` config, and the same prompt templates. The node "
-        "plan below is the target node set after your change; use the existing "
-        "graph as the source of truth for the config of nodes that carry over.\n\n"
-        f"```json\n{graph_json}\n```\n\n"
-    )
-
-
-def format_start_inputs_section(start_inputs: list[dict[str, Any]]) -> str:
-    """
-    Surface the planner's ``start_inputs`` list to the builder so it can
-    populate ``start.data.variables`` with the exact set of inputs every
-    downstream variable reference will need. Empty list → empty section,
-    because the builder may then declare no input variables (e.g. an
-    Advanced-Chat workflow that only consumes ``sys.query``).
-    """
-    if not start_inputs:
-        return ""
-    lines = ["# Start inputs (copy each entry verbatim into start.data.variables)"]
-    lines.append("")
-    for inp in start_inputs:
-        variable = str(inp.get("variable") or "").strip()
-        label = str(inp.get("label") or "").strip()
-        type_ = str(inp.get("type") or "paragraph").strip()
-        if not variable:
-            continue
-        lines.append(f"- variable={variable!r}  label={label!r}  type={type_!r}")
-    lines.append("")
-    return "\n".join(lines) + "\n"
-
-
-def format_builder_tool_catalogue_section(catalogue_text: str) -> str:
-    """
-    Builder-facing catalogue block. The builder needs the same identifiers
-    the planner saw, plus a stern reminder that ``tool`` nodes MUST set
-    ``provider_id`` / ``provider_name`` / ``tool_name`` to entries that
-    actually exist in this list — hallucinated tools fail at draft sync.
-    """
-    if not catalogue_text.strip():
-        return ""
-    return (
-        "# Available tools (use these exact provider/tool identifiers — "
-        "for each 'tool' node, set provider_id and provider_name to the "
-        "provider portion and tool_name to the tool portion)\n\n"
-        f"{catalogue_text}\n\n"
-    )
-
-
-def format_plan_block(plan_nodes: list[dict[str, Any]]) -> str:
-    """
-    Render the planner output as a numbered list the builder can quote.
-
-    Node IDs use no separator (``node1``, ``node2``, ...) because Dify's
-    run-time placeholder regex requires ``[a-zA-Z0-9_]`` in the node-id
-    slot — a hyphenated id like ``node-1`` would silently fail to match
-    at run time and the literal ``{{#node-1.var#}}`` survives into the
-    LLM prompt.
-
-    For container children (planner emitted a ``"parent": "<label>"`` key),
-    we resolve the parent label to its ``nodeN`` id and surface it on the
-    same line so the builder knows to set ``parentId`` and the
-    ``isInIteration`` / ``isInLoop`` markers on inner nodes.
-    """
-    # First pass: label → node-id so we can resolve "parent" hints.
-    label_to_id: dict[str, str] = {}
-    for idx, node in enumerate(plan_nodes, start=1):
-        label = str(node.get("label") or "")
-        if label and label not in label_to_id:
-            label_to_id[label] = f"node{idx}"
-
-    lines = []
-    for idx, node in enumerate(plan_nodes, start=1):
-        node_id = f"node{idx}"
-        label = node.get("label", "")
-        node_type = node.get("node_type", "")
-        purpose = node.get("purpose", "")
-        parent_label = str(node.get("parent") or "")
-        parent_clause = ""
-        if parent_label:
-            parent_id = label_to_id.get(parent_label, "")
-            if parent_id:
-                parent_clause = f"  parent={parent_id}"
-            else:
-                parent_clause = f"  parent={parent_label!r}"
-        lines.append(f"{idx}. id={node_id}  type={node_type}  label={label!r}{parent_clause}\n   purpose: {purpose}")
-    return "\n".join(lines)
-
-
-def get_builder_system_prompt(mode: str, node_types: Iterable[str] | None = None) -> str:
-    """
-    Build the builder system prompt for ``mode``, with a cheatsheet scoped to
-    ``node_types`` (the planner's chosen node types).
-
-    When ``node_types`` is ``None`` we return the cached full-cheatsheet
-    constant (back-compat default). When the runner passes the plan's node-type
-    set we assemble a fresh prompt carrying only the relevant per-type schemas,
-    so the builder isn't handed config for node types the workflow never uses.
-    """
-    if node_types is None:
-        return BUILDER_SYSTEM_PROMPT_ADVANCED_CHAT if mode == "advanced-chat" else BUILDER_SYSTEM_PROMPT_WORKFLOW
-    return _assemble_builder_system_prompt(mode, node_types)
+def get_node_config_snippet(node_type: str) -> str:
+    """Return the semantic config reference for one leaf node type."""
+    return _NODE_SNIPPETS.get(node_type, "")

api/core/workflow/generator/prompts/node_builder_prompts.py

@@ -0,0 +1,138 @@
+"""Compact prompts for parallel, per-node workflow configuration.
+
+Each call produces only the semantic ``data`` fields for one planned node.
+Canvas wrappers, shared labels, topology, layout, and edge defaults are owned
+by ``WorkflowGenerator`` so completion length scales with node configuration
+rather than with the full ReactFlow graph.
+"""
+
+import json
+from typing import Any
+
+from core.workflow.generator.prompts.builder_prompts import get_node_config_snippet
+
+_CONTAINER_CONFIG_SNIPPETS = {
+    "iteration": """- iteration:
+    {"iterator_selector": ["<src>", "<list-var>"],
+     "output_selector": ["<last-child>", "<out-var>"],
+     "is_parallel": false, "parallel_nums": 10,
+     "error_handle_mode": "terminated", "flatten_output": true}
+    The runner supplies start_node_id, child wrappers, and the synthetic start node.""",
+    "loop": """- loop:
+    {"break_conditions": [{"id": "c1",
+                            "variable_selector": ["<child>", "<var>"],
+                            "comparison_operator": "is",
+                            "value": "<value>"}],
+     "loop_count": 10, "logical_operator": "and"}
+    The runner supplies start_node_id, child wrappers, and the synthetic start node.""",
+}
+
+_NODE_BUILDER_HEAD = """You configure exactly ONE node in a Dify workflow.
+
+Return one JSON object with exactly this shape: {"config": {...}}.
+``config`` contains only node-type-specific ``data`` fields. Do NOT repeat id,
+type, title, desc, selected, position, wrapper fields, edges, or viewport.
+
+Rules:
+- Use only ids from the supplied normalized plan.
+- Placeholder strings use ``{{#node_id.variable#}}``; selector fields use
+  ``["node_id", "variable"]``. Never invent an upstream output.
+- Use the selected model verbatim for llm, question-classifier, and
+  parameter-extractor nodes.
+- Keep prompts/code concise but complete for the user's requested behavior.
+- Emit strict JSON only: no prose, Markdown, comments, or trailing commas.
+
+# Target node schema
+
+"""
+
+
+NODE_BUILDER_USER_PROMPT = """# Target node
+
+id={node_id}, type={node_type}, label={label!r}
+purpose={purpose}
+
+# User instruction
+
+{instruction}
+
+{ideal_output_section}{mode_section}{model_section}{tool_catalogue_section}{start_inputs_section}{existing_config_section}\
+# Normalized plan and topology
+
+{plan_json}
+
+Return {{"config": {{...}}}} for target node {node_id} now.
+"""
+
+
+def get_node_builder_system_prompt(node_type: str) -> str:
+    """Build a one-node prompt containing only that node's semantic schema."""
+    snippet = _CONTAINER_CONFIG_SNIPPETS.get(node_type) or get_node_config_snippet(node_type)
+    return _NODE_BUILDER_HEAD + (snippet or f"- {node_type}: emit the minimum valid config fields.")
+
+
+def format_parallel_plan(
+    plan_nodes: list[dict[str, Any]],
+    plan_edges: list[dict[str, Any]],
+    start_inputs: list[dict[str, Any]] | None = None,
+) -> str:
+    """Serialize the shared plan compactly so every node call has graph context.
+
+    ``start_inputs`` rides along so downstream builders reference the declared
+    ``{{#<start-id>.<variable>#}}`` names instead of guessing them from prose
+    — a guessed name gets auto-injected as a spurious form input later.
+    """
+    payload: dict[str, Any] = {"nodes": plan_nodes, "edges": plan_edges}
+    if start_inputs:
+        payload["start_inputs"] = start_inputs
+    return json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
+
+
+def format_mode_section(mode: str) -> str:
+    """Tell each builder which app mode it is configuring for.
+
+    Matters most in advanced-chat, where ``sys.query`` / ``sys.files`` are the
+    sanctioned way to reference the user's message — without this the model
+    invents start-node variables that postprocess then materializes as
+    spurious form inputs.
+    """
+    if mode == "advanced-chat":
+        return (
+            "# App mode\n\n"
+            "advanced-chat: the user's chat message is available as sys.query and uploaded files "
+            'as sys.files — placeholder {{#sys.query#}}, selector ["sys", "query"]. Reference them '
+            "directly; do NOT invent start-node variables for the chat message.\n\n"
+        )
+    return (
+        "# App mode\n\n"
+        "workflow: there are NO automatic system variables; reference user input only through "
+        "the start node's declared variables.\n\n"
+    )
+
+
+def format_start_inputs_section(start_inputs: list[dict[str, Any]]) -> str:
+    """Render planner-declared inputs for the start-node builder only."""
+    if not start_inputs:
+        return ""
+    lines = ["# Start inputs (copy each entry verbatim into start.data.variables)", ""]
+    for input_ in start_inputs:
+        variable = str(input_.get("variable") or "").strip()
+        if not variable:
+            continue
+        label = str(input_.get("label") or "").strip()
+        type_ = str(input_.get("type") or "paragraph").strip()
+        lines.append(f"- variable={variable!r}  label={label!r}  type={type_!r}")
+    lines.append("")
+    return "\n".join(lines) + "\n"
+
+
+def format_tool_catalogue_section(catalogue_text: str) -> str:
+    """Render exact tool identifiers for a tool-node builder only."""
+    if not catalogue_text.strip():
+        return ""
+    return (
+        "# Available tools (use these exact provider/tool identifiers — "
+        "set provider_id and provider_name to the provider portion and "
+        "tool_name to the tool portion)\n\n"
+        f"{catalogue_text}\n\n"
+    )

api/core/workflow/generator/prompts/planner_prompts.py

@@ -1,13 +1,14 @@
 """
 Planner prompts.
 
-The planner is the lightweight first step in the slim planner→builder pipeline.
+The planner is the lightweight first step in the slim planner→node-builders pipeline.
 It receives the user's natural-language instruction and emits a high-level
-node plan in JSON. The builder later turns that plan into the final graph.
+node and edge plan in JSON. Node builders later produce configs that the runner
+assembles into the final graph.
 
 We keep the planner deliberately short — the heavy lifting (config schemas,
-edge wiring, default values) belongs in the builder. The planner only commits
-to the *which-node-types* decision so the builder gets a tight scaffold.
+default values) belongs in the builders. The planner commits to the minimum
+topology and node types so every builder gets a tight scaffold.
 """
 
 PLANNER_SYSTEM_PROMPT = """You are a Dify workflow planner.
@@ -39,6 +40,8 @@ minimum set of Dify workflow nodes needed to fulfil it, in execution order.
                           mutually-exclusive paths before "end" / "answer".
 - "list-operator"       — filter / sort / slice an array variable (e.g. the items
                           fed into or produced by an "iteration").
+- "assigner"            — update an existing conversation or loop variable.
+- "human-input"         — pause for a person to review, approve, or enter data.
 
 # Rules
 
@@ -97,22 +100,45 @@ minimum set of Dify workflow nodes needed to fulfil it, in execution order.
     variables are automatic — downstream nodes may reference them without
     a ``start_inputs`` entry. In Workflow mode there is NO automatic
     variable; everything the user supplies must be in ``start_inputs``.
-11. Output strictly the JSON object — no prose, no Markdown, no code fences.
+11. Give every node a unique runtime-safe ``id`` using only letters, digits,
+    and underscores. In create mode use ``node1``, ``node2``, ... in node-list
+    order. In refine mode preserve the existing id for every retained node.
+12. Emit the target graph's edges in ``edges``. Each edge is
+    ``{"source": "<id>", "target": "<id>"}``; add ``source_handle`` only
+    for branch nodes: if-else case id, question-classifier class id, or
+    human-input action id. Container children reference the container id in
+    their ``parent`` field; do not emit the synthetic iteration/loop start node.
+13. In refine mode add ``action`` to every retained target node:
+    ``"keep"`` when its data config is unchanged, ``"update"`` when the user
+    asked to change its config, and ``"add"`` for a new node. Removed nodes are
+    omitted. Edge-only rewiring does not require changing a node's action.
+14. Output strictly the JSON object — no prose, no Markdown, no code fences.
+15. Echo the app mode in the ``mode`` output field — exactly "workflow" or
+    "advanced-chat". When the ``# Mode`` section says auto, YOU decide:
+    "workflow" for one-shot automations (run once with form inputs, return a
+    result), "advanced-chat" for conversational multi-turn assistants. The
+    terminal node must match the chosen mode (rule 2): "end" for workflow,
+    "answer" for advanced-chat.
 
 # Output schema
 
 {
   "title": "<≤ 40-char title of the workflow>",
   "description": "<one-sentence summary>",
+  "mode": "workflow | advanced-chat",
   "app_name": "<≤ 30-char product-style name, e.g. 'URL Summarizer'>",
   "icon": "<single emoji that captures the workflow's purpose, e.g. '📰'>",
   "start_inputs": [
     {"variable": "url", "label": "URL", "type": "text-input"}
   ],
   "nodes": [
-    {"label": "Start",      "node_type": "start", "purpose": "..."},
-    {"label": "Summarize",  "node_type": "llm",   "purpose": "..."},
-    {"label": "End",        "node_type": "end",   "purpose": "..."}
+    {"id": "node1", "label": "Start",     "node_type": "start", "purpose": "..."},
+    {"id": "node2", "label": "Summarize", "node_type": "llm",   "purpose": "..."},
+    {"id": "node3", "label": "End",       "node_type": "end",   "purpose": "..."}
+  ],
+  "edges": [
+    {"source": "node1", "target": "node2"},
+    {"source": "node2", "target": "node3"}
   ]
 }
 """
@@ -140,7 +166,8 @@ def format_existing_graph_section(current_graph: dict | None) -> str:
 
     We pass only ids / node-types / titles + edge endpoints here — the planner
     decides *which nodes* exist, so it needs the shape, not the per-node config.
-    The builder gets the full graph JSON to preserve untouched node config.
+    Node builders receive only the config of a node marked ``update``;
+    configs marked ``keep`` are reused directly.
     """
     if not current_graph:
         return ""
@@ -156,7 +183,13 @@ def format_existing_graph_section(current_graph: dict | None) -> str:
     for edge in edges:
         if not isinstance(edge, dict):
             continue
-        edge_lines.append(f"- {edge.get('source', '')} -> {edge.get('target', '')}")
+        # Branch wiring (if-else case ids, classifier class ids, human-input
+        # action ids) lives in ``sourceHandle``. The planner is the only
+        # source of edges for the rebuilt graph, so the real handle must be
+        # surfaced here or refine silently rewires branches.
+        handle = str(edge.get("sourceHandle") or "")
+        handle_suffix = f" (source_handle={handle!r})" if handle and handle != "source" else ""
+        edge_lines.append(f"- {edge.get('source', '')} -> {edge.get('target', '')}{handle_suffix}")
     nodes_block = "\n".join(node_lines) or "(none)"
     edges_block = "\n".join(edge_lines) or "(none)"
     return (
@@ -166,7 +199,9 @@ def format_existing_graph_section(current_graph: dict | None) -> str:
         "node list to reflect that change while keeping everything the "
         "instruction does not mention — preserve existing nodes, their order, "
         "and their labels wherever the change leaves them untouched. Only add, "
-        "remove, or rename nodes the requested change actually requires.\n\n"
+        "remove, or rename nodes the requested change actually requires. "
+        "For every retained edge, copy its source_handle verbatim from the "
+        "list below — branch wiring must survive the refine unchanged.\n\n"
         f"Current nodes:\n{nodes_block}\n\n"
         f"Current edges:\n{edges_block}\n\n"
     )

api/core/workflow/generator/runner.py

@@ -1,14 +1,14 @@
 """
 Workflow generator runner.
 
-Slim planner→builder pipeline. Pure domain logic; the model instance is
+Slim planner→parallel-node-builder pipeline. Pure domain logic; the model instance is
 injected by ``WorkflowGeneratorService`` so this module stays cleanly
 separated from the infrastructure layer.
 
 Pipeline:
 
     1. PLANNER  — short LLM call producing a high-level node list.
-    2. BUILDER  — structured-output LLM call producing the full graph JSON.
+    2. BUILDERS — bounded concurrent LLM calls producing compact node configs.
     3. POSTPROC — fill safe defaults, lay nodes out left-to-right, dedupe
                   edge ids, and run a final structural sanity check.
 
@@ -20,7 +20,8 @@ Intentionally NOT here (deferred to a future iteration):
     - Tool / model catalogue filtering
 
 If quality regresses below product threshold we add those back; for now the
-single planner+builder pair shipped behind cmd+k `/create` is enough.
+planner and bounded parallel node builders shipped behind cmd+k `/create` are
+enough.
 """
 
 import json
@@ -28,17 +29,22 @@ import logging
 import re
 import time
 from collections.abc import Iterator
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from copy import deepcopy
 from typing import Any, ClassVar, cast
 
 import json_repair
 
-from core.workflow.generator.prompts.builder_prompts import (
-    BUILDER_USER_PROMPT,
-    format_builder_existing_graph_section,
-    format_builder_tool_catalogue_section,
-    format_plan_block,
+from configs import dify_config
+from core.workflow.generator.prompts.node_builder_prompts import (
+    NODE_BUILDER_USER_PROMPT,
+    format_mode_section,
+    format_parallel_plan,
     format_start_inputs_section,
-    get_builder_system_prompt,
+    get_node_builder_system_prompt,
+)
+from core.workflow.generator.prompts.node_builder_prompts import (
+    format_tool_catalogue_section as format_node_tool_catalogue_section,
 )
 from core.workflow.generator.prompts.planner_prompts import (
     PLANNER_SYSTEM_PROMPT,
@@ -55,6 +61,7 @@ from core.workflow.generator.types import (
     WorkflowGenerateErrorDict,
     WorkflowGenerateResultDict,
     WorkflowGenerationMode,
+    WorkflowGenerationModeRequest,
 )
 from graphon.enums import BuiltinNodeTypes
 from graphon.model_runtime.entities.llm_entities import LLMResult
@@ -96,11 +103,31 @@ _DEFAULT_FILE_UPLOAD_METHODS = ("local_file", "remote_url")
 
 # Token ceiling for the planner call when the caller didn't pin one. The plan
 # is a short JSON node list (a handful of nodes with labels/purposes), so this
-# is generous headroom while still bounding a runaway response. The builder is
-# left on the caller's budget — it emits the full graph and genuinely needs it.
+# is generous headroom while still bounding a runaway response. Builder calls
+# keep the caller's budget so complex node configs are not truncated.
 _PLANNER_DEFAULT_MAX_TOKENS = 4096
 
 
+# Per-node calls trade a larger request count for a shorter critical path.
+# The cap comes from ``WORKFLOW_GENERATOR_NODE_BUILDER_MAX_WORKERS`` (default 6,
+# enough to run the planner's recommended 3–6-node plans as a single wave);
+# provider rate-limit bursts are absorbed by ``_invoke_with_retry``'s bounded
+# backoff, and operators can dial the env var back down if their provider is
+# stricter. Read at call time so tests (and live config reloads) can adjust it
+# without re-importing.
+def _node_builder_max_workers() -> int:
+    return dify_config.WORKFLOW_GENERATOR_NODE_BUILDER_MAX_WORKERS
+
+
+_MODEL_NODE_TYPES = frozenset(
+    {
+        BuiltinNodeTypes.LLM,
+        BuiltinNodeTypes.QUESTION_CLASSIFIER,
+        BuiltinNodeTypes.PARAMETER_EXTRACTOR,
+    }
+)
+
+
 # Appended as a trailing user message on the SECOND (and only) attempt when
 # the first response wasn't parseable as JSON. Keep this terse — the model
 # already has its full instructions in the original system message; this is
@@ -110,6 +137,12 @@ _JSON_RETRY_HINT = (
     "Do not include any prose, markdown code fences, comments, or trailing commas."
 )
 
+_PLANNER_SCHEMA_RETRY_HINT = (
+    "Your plan did not match the required topology schema. Return the complete plan again with "
+    "a unique non-empty id on every node and a non-empty edges array whose source and target "
+    "reference those ids. Return ONLY the JSON object."
+)
+
 
 # Provider hiccups we retry: a dropped connection, a 5xx, or a rate-limit are
 # all transient — the same request usually succeeds moments later. We do NOT
@@ -189,14 +222,58 @@ def _result_with_errors(
 def _with_mode(result: WorkflowGenerateResultDict, mode: WorkflowGenerationMode) -> WorkflowGenerateResultDict:
     """Stamp the resolved concrete ``mode`` onto a result envelope.
 
-    ``mode="auto"`` requests are resolved to a concrete mode before planning;
-    echoing it back lets the frontend pick the right app type to create. It's
-    present for explicit modes too so the response shape stays uniform.
+    ``mode="auto"`` requests are resolved to a concrete mode from the planner
+    output; echoing it back lets the frontend pick the right app type to
+    create. It's present for explicit modes too so the response shape stays
+    uniform.
     """
     result["mode"] = mode
     return result
 
 
+def _fallback_mode(mode: WorkflowGenerationModeRequest) -> WorkflowGenerationMode:
+    """Concrete mode for envelopes emitted before the planner resolved one.
+
+    ``auto`` maps to the conversational default — the same never-fail fallback
+    the old standalone classifier used — so ``result.mode`` never leaks the
+    ``auto`` sentinel to the frontend.
+    """
+    return "advanced-chat" if mode == "auto" else mode
+
+
+def _planner_prompt_mode(mode: WorkflowGenerationModeRequest) -> str:
+    """Mode string interpolated into the planner user prompt.
+
+    For ``auto`` the value is self-describing so the planner knows the choice
+    is delegated to it (system-prompt rule 15).
+    """
+    return "auto (choose workflow or advanced-chat)" if mode == "auto" else mode
+
+
+def _resolve_generation_mode(
+    requested: WorkflowGenerationModeRequest, plan: PlannerResultDict
+) -> WorkflowGenerationMode:
+    """Resolve the request mode into the concrete generation mode.
+
+    An explicit request always wins — a contradictory planner ``mode`` field is
+    ignored. For ``auto``: trust the planner's echoed ``mode``, else infer from
+    the plan's terminal node type (the structural source of truth the graph is
+    validated against), else fall back to the conversational default. Lenient
+    on purpose — a bad ``mode`` value must never fail the plan.
+    """
+    if requested != "auto":
+        return requested
+    planner_mode = str(plan.get("mode") or "").strip().lower()
+    if planner_mode in ("workflow", "advanced-chat"):
+        return cast(WorkflowGenerationMode, planner_mode)
+    node_types = {str(node.get("node_type") or "") for node in plan.get("nodes") or [] if isinstance(node, dict)}
+    if BuiltinNodeTypes.ANSWER in node_types:
+        return "advanced-chat"
+    if BuiltinNodeTypes.END in node_types:
+        return "workflow"
+    return "advanced-chat"
+
+
 def _build_plan_event(
     *,
     plan: PlannerResultDict,
@@ -255,7 +332,7 @@ class WorkflowGenerator:
         provider: str,
         model_name: str,
         model_mode: str,
-        mode: WorkflowGenerationMode,
+        mode: WorkflowGenerationModeRequest,
         instruction: str,
         ideal_output: str = "",
         tool_catalogue_text: str = "",
@@ -263,20 +340,26 @@ class WorkflowGenerator:
         current_graph: dict[str, Any] | None = None,
     ) -> WorkflowGenerateResultDict:
         """
-        Run planner → builder → postprocess and return a graph payload.
+        Run planner → node builders → postprocess and return a graph payload.
+
+        ``mode`` accepts the ``"auto"`` sentinel — the planner then chooses the
+        concrete mode itself (echoed in its ``mode`` output field) so no extra
+        classification call is needed; the resolution is stamped onto the
+        result envelope.
 
         ``current_graph`` switches the pipeline from create mode to REFINE
-        mode: the existing draft graph is injected into both the planner
-        (compact node/edge summary) and the builder (full JSON) so the LLM
-        amends the graph the user is editing instead of inventing a new one.
-        ``None`` (the default) is plain create-from-scratch behaviour.
+        mode: the existing draft graph is summarized for the planner. Node
+        builders receive only the config of the node they update, while configs
+        marked ``keep`` are reused without an LLM call. ``None`` (the default)
+        is plain create-from-scratch behaviour.
 
         ``tool_catalogue_text`` is the formatted list of installed tools for
         the calling tenant (see ``tool_catalogue.build_tool_catalogue`` /
         ``format_tool_catalogue``). It's injected into both the planner and
         builder prompts so the LLM can pick concrete ``provider/tool``
-        identifiers instead of inventing names; an empty string skips the
-        section entirely (useful for unit tests).
+        identifiers instead of inventing names; node builders receive it
+        only for tool nodes. An empty string skips the section entirely (useful
+        for unit tests).
 
         ``installed_tools`` is the structural sibling — a set of
         ``(provider_name, tool_name)`` pairs the validator consults to reject
@@ -316,7 +399,7 @@ class WorkflowGenerator:
         # The event generator always emits exactly one result envelope; this
         # fallback only guards against a future refactor that forgets to.
         if result is None:
-            result = _with_mode(_empty_result(), mode)
+            result = _with_mode(_empty_result(), _fallback_mode(mode))
         return result
 
     @classmethod
@@ -328,7 +411,7 @@ class WorkflowGenerator:
         provider: str,
         model_name: str,
         model_mode: str,
-        mode: WorkflowGenerationMode,
+        mode: WorkflowGenerationModeRequest,
         instruction: str,
         ideal_output: str = "",
         tool_catalogue_text: str = "",
@@ -368,7 +451,7 @@ class WorkflowGenerator:
         provider: str,
         model_name: str,
         model_mode: str,
-        mode: WorkflowGenerationMode,
+        mode: WorkflowGenerationModeRequest,
         instruction: str,
         ideal_output: str = "",
         tool_catalogue_text: str = "",
@@ -376,7 +459,7 @@ class WorkflowGenerator:
         current_graph: dict[str, Any] | None = None,
     ) -> Iterator[tuple[str, dict[str, Any]]]:
         """
-        Drive planner → builder → postprocess and yield generation events.
+        Drive planner → node builders → postprocess and yield generation events.
 
         Shared core for both ``generate_workflow_graph`` (keeps only the final
         ``result``) and ``generate_workflow_graph_stream`` (streams every
@@ -402,11 +485,16 @@ class WorkflowGenerator:
             ),
         )
         if plan_err is not None:
-            yield "result", cast(dict[str, Any], _with_mode(_result_with_errors(_empty_result(), [plan_err]), mode))
+            failed = _with_mode(_result_with_errors(_empty_result(), [plan_err]), _fallback_mode(mode))
+            yield "result", cast(dict[str, Any], failed)
             return
 
         # The lambda return is non-None when no error fired — narrow it for type-checkers.
         plan = cast(PlannerResultDict, plan)
+        # ``auto`` requests resolve here — the planner echoed its mode choice
+        # (or we infer it from the plan's terminal node). Explicit modes pass
+        # through unchanged. Everything downstream uses the concrete mode.
+        resolved_mode = _resolve_generation_mode(mode, plan)
         plan_nodes: list[dict[str, Any]] = cast(list[dict[str, Any]], plan.get("nodes", []))
         if not plan_nodes:
             empty_plan = _with_mode(
@@ -414,15 +502,12 @@ class WorkflowGenerator:
                     _empty_result(),
                     [_err(WorkflowGenerateErrorCode.EMPTY_PLAN, "Planner returned no nodes")],
                 ),
-                mode,
+                resolved_mode,
             )
             yield "result", cast(dict[str, Any], empty_plan)
             return
 
-        # A single LLM cannot select multiple retrieval outputs as context.
-        # Make the required template fan-in explicit in the plan so the
-        # builder receives its schema and assigns stable sequential ids.
-        cls._insert_multi_retrieval_template_plan(plan_nodes)
+        plan_edges = [cast(dict[str, Any], edge) for edge in (plan.get("edges") or []) if isinstance(edge, dict)]
 
         # Planner-supplied user-input declarations. The builder uses these to
         # populate ``start.data.variables`` so downstream ``{#start.<var>#}``
@@ -436,34 +521,48 @@ class WorkflowGenerator:
 
         # First event the stream sees: the high-level plan, before the slower
         # builder call. Non-streaming callers ignore it.
-        yield "plan", _build_plan_event(plan=plan, plan_nodes=plan_nodes, start_inputs=start_inputs, mode=mode)
+        yield "plan", _build_plan_event(plan=plan, plan_nodes=plan_nodes, start_inputs=start_inputs, mode=resolved_mode)
 
         # ── 2. BUILDER ────────────────────────────────────────────────────
-        graph, build_err = cls._run_stage(
-            stage="Builder",
-            failure_fallback_message="Failed to build workflow graph",
-            run=lambda: cls._run_builder(
+        builder_started_at = time.monotonic()
+
+        def build_graph() -> GraphDict:
+            return cls._run_parallel_node_builders(
                 model_instance=model_instance,
                 model_parameters=model_parameters,
                 provider=provider,
                 model_name=model_name,
                 model_mode=model_mode,
-                mode=mode,
+                mode=resolved_mode,
                 instruction=instruction,
                 ideal_output=ideal_output,
                 plan_nodes=plan_nodes,
+                plan_edges=plan_edges,
                 tool_catalogue_text=tool_catalogue_text,
                 start_inputs=start_inputs,
                 current_graph=current_graph,
-            ),
+            )
+
+        graph, build_err = cls._run_stage(
+            stage="Builder",
+            failure_fallback_message="Failed to build workflow graph",
+            run=build_graph,
+        )
+        logger.info(
+            "Workflow generator: node builders completed nodes=%s elapsed_ms=%.1f",
+            len(plan_nodes),
+            (time.monotonic() - builder_started_at) * 1000,
         )
         if build_err is not None:
-            yield "result", cast(dict[str, Any], _with_mode(_result_with_errors(_empty_result(), [build_err]), mode))
+            yield (
+                "result",
+                cast(dict[str, Any], _with_mode(_result_with_errors(_empty_result(), [build_err]), resolved_mode)),
+            )
             return
         graph = cast(GraphDict, graph)
 
         # ── 3. POSTPROC + VALIDATE ────────────────────────────────────────
-        graph = cls._postprocess_graph(graph=graph, mode=mode)
+        graph = cls._postprocess_graph(graph=graph, mode=resolved_mode)
 
         # ``app_name`` / ``icon`` are planner display metadata; both default
         # to "" when the LLM omits them — the FE owns the fallback.
@@ -475,13 +574,13 @@ class WorkflowGenerator:
             "error": "",
             "errors": [],
         }
-        _with_mode(result, mode)
+        _with_mode(result, resolved_mode)
 
         # Final structural sanity check — fail closed if start/end shape is
         # wrong, container topology is broken, a tool was hallucinated, or a
         # variable reference points at a node that won't expose it. We still
         # return the partial graph so the caller can debug or salvage it.
-        structural_errors = cls._validate_structure(graph=graph, mode=mode, installed_tools=installed_tools)
+        structural_errors = cls._validate_structure(graph=graph, mode=resolved_mode, installed_tools=installed_tools)
         if structural_errors:
             logger.warning("Workflow generator: structural validation failed: %s", structural_errors)
             yield "result", cast(dict[str, Any], _result_with_errors(result, structural_errors))
@@ -622,14 +721,14 @@ class WorkflowGenerator:
         *,
         model_instance,
         model_parameters: dict[str, Any],
-        mode: WorkflowGenerationMode,
+        mode: WorkflowGenerationModeRequest,
         instruction: str,
         ideal_output: str,
         tool_catalogue_text: str,
         current_graph: dict[str, Any] | None = None,
     ) -> PlannerResultDict:
         user_prompt = PLANNER_USER_PROMPT.format(
-            mode=mode,
+            mode=_planner_prompt_mode(mode),
             instruction=instruction.strip(),
             existing_graph_section=format_existing_graph_section(current_graph),
             ideal_output_section=format_ideal_output_section(ideal_output),
@@ -639,59 +738,65 @@ class WorkflowGenerator:
             SystemPromptMessage(content=PLANNER_SYSTEM_PROMPT),
             UserPromptMessage(content=user_prompt),
         ]
+        clamped_parameters = _clamp_for_planner(model_parameters)
         parsed = cls._invoke_and_parse_json(
             model_instance=model_instance,
             messages=messages,
-            model_parameters=_clamp_for_planner(model_parameters),
+            model_parameters=clamped_parameters,
             stage="Planner",
         )
+        try:
+            return cls._validate_planner_schema(parsed)
+        except _StageSchemaError:
+            logger.info("Workflow generator: planner schema invalid; retrying once")
+        parsed = cls._invoke_and_parse_json(
+            model_instance=model_instance,
+            messages=[*messages, UserPromptMessage(content=_PLANNER_SCHEMA_RETRY_HINT)],
+            model_parameters=clamped_parameters,
+            stage="Planner",
+        )
+        return cls._validate_planner_schema(parsed)
 
+    @staticmethod
+    def _validate_planner_schema(parsed: dict[str, Any]) -> PlannerResultDict:
+        """Require the single planner contract consumed by node builders."""
         nodes = parsed.get("nodes")
         if not isinstance(nodes, list):
             raise _StageSchemaError("Planner", "missing 'nodes' array")
+        if not nodes:
+            return cast(PlannerResultDict, parsed)
+
+        node_ids: set[str] = set()
         for node in nodes:
-            if not isinstance(node, dict) or "node_type" not in node:
+            if not isinstance(node, dict) or not node.get("node_type"):
                 raise _StageSchemaError("Planner", f"malformed node entry: {node!r}")
+            node_id = node.get("id")
+            if not isinstance(node_id, str) or not node_id.strip():
+                raise _StageSchemaError("Planner", f"node missing non-empty id: {node!r}")
+            if node_id in node_ids:
+                raise _StageSchemaError("Planner", f"duplicate node id: {node_id!r}")
+            node_ids.add(node_id)
+
+        edges = parsed.get("edges")
+        if not isinstance(edges, list) or not edges:
+            raise _StageSchemaError("Planner", "missing non-empty 'edges' array")
+        for edge in edges:
+            if not isinstance(edge, dict):
+                raise _StageSchemaError("Planner", f"malformed edge entry: {edge!r}")
+            source = edge.get("source")
+            target = edge.get("target")
+            if not isinstance(source, str) or not isinstance(target, str):
+                raise _StageSchemaError("Planner", f"edge missing source or target: {edge!r}")
+            if source not in node_ids or target not in node_ids:
+                raise _StageSchemaError("Planner", f"edge references unknown node: {edge!r}")
 
         return cast(PlannerResultDict, parsed)
 
-    # ------------------------------------------------------------------
-    # Plan normalization
-    # ------------------------------------------------------------------
-    @staticmethod
-    def _insert_multi_retrieval_template_plan(plan_nodes: list[dict[str, Any]]) -> None:
-        """Insert the unambiguous multi-retrieval template step when omitted.
-
-        Multiple LLM nodes make ownership ambiguous, so that case remains in
-        the planner's hands. With exactly one LLM, every independent retrieval
-        result can safely fan into one template immediately before that LLM.
-        """
-        node_types = [str(node.get("node_type") or "") for node in plan_nodes]
-        if node_types.count(BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL) < 2:
-            return
-        if node_types.count(BuiltinNodeTypes.LLM) != 1:
-            return
-        if BuiltinNodeTypes.TEMPLATE_TRANSFORM in node_types:
-            return
-
-        llm_index = node_types.index(BuiltinNodeTypes.LLM)
-        retrievals_before_llm = node_types[:llm_index].count(BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL)
-        if retrievals_before_llm < 2:
-            return
-        plan_nodes.insert(
-            llm_index,
-            {
-                "label": "Combine Knowledge",
-                "node_type": BuiltinNodeTypes.TEMPLATE_TRANSFORM,
-                "purpose": "Combine every knowledge retrieval result into one labelled context for the LLM.",
-            },
-        )
-
     # ------------------------------------------------------------------
     # Builder
     # ------------------------------------------------------------------
     @classmethod
-    def _run_builder(
+    def _run_parallel_node_builders(
         cls,
         *,
         model_instance,
@@ -703,53 +808,275 @@ class WorkflowGenerator:
         instruction: str,
         ideal_output: str,
         plan_nodes: list[dict[str, Any]],
+        plan_edges: list[dict[str, Any]],
         tool_catalogue_text: str,
-        start_inputs: list[dict[str, Any]] | None = None,
-        current_graph: dict[str, Any] | None = None,
+        start_inputs: list[dict[str, Any]],
+        current_graph: dict[str, Any] | None,
     ) -> GraphDict:
-        user_prompt = BUILDER_USER_PROMPT.format(
+        """Build changed node configs concurrently and expand them into a graph.
+
+        Refine plans can mark existing nodes as ``keep``; those nodes bypass
+        the model entirely and retain their full data config. Every other node
+        gets one compact call, with at most ``_node_builder_max_workers()``
+        calls in flight. Any fragment failure aborts the graph, preserving the
+        generator's existing fail-closed contract.
+        """
+        existing_by_id = {
+            str(node.get("id")): node
+            for node in ((current_graph or {}).get("nodes") or [])
+            if isinstance(node, dict) and node.get("id")
+        }
+        existing_edges = [edge for edge in ((current_graph or {}).get("edges") or []) if isinstance(edge, dict)]
+        nodes_to_build = [
+            node for node in plan_nodes if not (node.get("action") == "keep" and str(node.get("id")) in existing_by_id)
+        ]
+
+        # Shared across every builder call in this request — compute once.
+        plan_json = format_parallel_plan(plan_nodes, plan_edges, start_inputs)
+        mode_section = format_mode_section(mode)
+
+        configs_by_id: dict[str, dict[str, Any]] = {}
+        if nodes_to_build:
+            max_workers = min(_node_builder_max_workers(), len(nodes_to_build))
+            with ThreadPoolExecutor(max_workers=max_workers, thread_name_prefix="workflow-node-builder") as executor:
+                futures = {
+                    executor.submit(
+                        cls._run_node_builder,
+                        model_instance=model_instance,
+                        model_parameters=model_parameters,
+                        provider=provider,
+                        model_name=model_name,
+                        model_mode=model_mode,
+                        mode_section=mode_section,
+                        instruction=instruction,
+                        ideal_output=ideal_output,
+                        target_node=node,
+                        plan_json=plan_json,
+                        tool_catalogue_text=tool_catalogue_text,
+                        start_inputs=start_inputs,
+                        existing_node=existing_by_id.get(str(node.get("id"))),
+                    ): str(node.get("id"))
+                    for node in nodes_to_build
+                }
+                try:
+                    for future in as_completed(futures):
+                        node_id = futures[future]
+                        configs_by_id[node_id] = future.result()
+                except BaseException:
+                    # Fail fast: one failed fragment aborts the whole graph, so
+                    # queued builder calls would only burn quota and delay the
+                    # error envelope. In-flight calls cannot be interrupted;
+                    # they finish while the pool shuts down.
+                    for pending in futures:
+                        pending.cancel()
+                    raise
+
+        return cls._assemble_parallel_graph(
+            plan_nodes=plan_nodes,
+            plan_edges=plan_edges,
+            configs_by_id=configs_by_id,
+            existing_by_id=existing_by_id,
+            existing_edges=existing_edges,
+        )
+
+    @classmethod
+    def _run_node_builder(
+        cls,
+        *,
+        model_instance,
+        model_parameters: dict[str, Any],
+        provider: str,
+        model_name: str,
+        model_mode: str,
+        mode_section: str,
+        instruction: str,
+        ideal_output: str,
+        target_node: dict[str, Any],
+        plan_json: str,
+        tool_catalogue_text: str,
+        start_inputs: list[dict[str, Any]],
+        existing_node: dict[str, Any] | None,
+    ) -> dict[str, Any]:
+        """Generate only the semantic config for one normalized plan node."""
+        node_id = str(target_node.get("id") or "")
+        node_type = str(target_node.get("node_type") or "")
+        model_section = ""
+        if node_type in _MODEL_NODE_TYPES:
+            model_section = (
+                f"# Selected model (copy verbatim)\n\nprovider={provider}, name={model_name}, mode={model_mode}\n\n"
+            )
+        existing_config_section = ""
+        if existing_node:
+            existing_data = existing_node.get("data") if isinstance(existing_node.get("data"), dict) else {}
+            existing_config_section = (
+                "# Existing config to preserve unless the instruction changes it\n\n"
+                f"{json.dumps(existing_data, ensure_ascii=False, separators=(',', ':'))}\n\n"
+            )
+        user_prompt = NODE_BUILDER_USER_PROMPT.format(
+            node_id=node_id,
+            node_type=node_type,
+            label=str(target_node.get("label") or ""),
+            purpose=str(target_node.get("purpose") or ""),
             instruction=instruction.strip(),
             ideal_output_section=format_ideal_output_section(ideal_output),
-            existing_graph_section=format_builder_existing_graph_section(current_graph),
-            provider=provider,
-            name=model_name,
-            mode_label=model_mode,
-            plan_block=format_plan_block(plan_nodes),
-            tool_catalogue_section=format_builder_tool_catalogue_section(tool_catalogue_text),
-            start_inputs_section=format_start_inputs_section(start_inputs or []),
+            mode_section=mode_section,
+            model_section=model_section,
+            tool_catalogue_section=(
+                format_node_tool_catalogue_section(tool_catalogue_text) if node_type == BuiltinNodeTypes.TOOL else ""
+            ),
+            start_inputs_section=(
+                format_start_inputs_section(start_inputs) if node_type == BuiltinNodeTypes.START else ""
+            ),
+            existing_config_section=existing_config_section,
+            plan_json=plan_json,
         )
-        # Scope the builder cheatsheet to exactly the node types the planner
-        # chose, so the prompt carries each type's FULL schema (e.g. a file
-        # start variable's required ``allowed_file_types``) without dragging in
-        # config for unrelated node types.
-        plan_node_types = {
-            str(node.get("node_type") or "").strip() for node in plan_nodes if str(node.get("node_type") or "").strip()
-        }
-        messages = [
-            SystemPromptMessage(content=get_builder_system_prompt(mode, plan_node_types)),
-            UserPromptMessage(content=user_prompt),
-        ]
         parsed = cls._invoke_and_parse_json(
             model_instance=model_instance,
-            messages=messages,
+            messages=[
+                SystemPromptMessage(content=get_node_builder_system_prompt(node_type)),
+                UserPromptMessage(content=user_prompt),
+            ],
             model_parameters=model_parameters,
-            stage="Builder",
+            stage=f"Builder {node_id}",
         )
+        config = parsed.get("config")
+        if not isinstance(config, dict):
+            raise _StageSchemaError(f"Builder {node_id}", "missing 'config' object")
+        return cast(dict[str, Any], config)
 
-        nodes = parsed.get("nodes")
-        edges = parsed.get("edges")
-        if not isinstance(nodes, list) or not isinstance(edges, list):
-            raise _StageSchemaError("Builder", "graph missing 'nodes' or 'edges' arrays")
+    @classmethod
+    def _assemble_parallel_graph(
+        cls,
+        *,
+        plan_nodes: list[dict[str, Any]],
+        plan_edges: list[dict[str, Any]],
+        configs_by_id: dict[str, dict[str, Any]],
+        existing_by_id: dict[str, dict[str, Any]],
+        existing_edges: list[dict[str, Any]] | None = None,
+    ) -> GraphDict:
+        """Expand compact node configs and planner topology into graph JSON.
 
-        viewport = parsed.get("viewport") or _DEFAULT_VIEWPORT
-        return cast(
-            GraphDict,
-            {
-                "nodes": nodes,
-                "edges": edges,
-                "viewport": viewport,
-            },
-        )
+        ``existing_edges`` (refine only) preserves wiring the planner cannot
+        express: the synthetic ``<container>start`` entry edge keeps its
+        existing target instead of being re-pointed at whichever child the
+        planner happened to list first.
+        """
+        label_to_id = {
+            str(node.get("label")): str(node.get("id")) for node in plan_nodes if node.get("label") and node.get("id")
+        }
+        type_by_id = {str(node.get("id")): str(node.get("node_type") or "") for node in plan_nodes}
+        children_by_parent: dict[str, list[str]] = {}
+        nodes: list[dict[str, Any]] = []
+
+        for planned in plan_nodes:
+            node_id = str(planned.get("id") or "")
+            node_type = str(planned.get("node_type") or "")
+            existing = existing_by_id.get(node_id)
+            node: dict[str, Any]
+            if planned.get("action") == "keep" and existing is not None:
+                node = deepcopy(existing)
+            else:
+                config = dict(configs_by_id.get(node_id) or {})
+                for shared_key in ("type", "title", "desc", "selected"):
+                    config.pop(shared_key, None)
+                data: dict[str, Any] = {
+                    "type": node_type,
+                    "title": str(planned.get("label") or node_id),
+                    "desc": str(planned.get("purpose") or ""),
+                    **config,
+                }
+                node = deepcopy(existing) if existing is not None else {"id": node_id}
+                node["id"] = node_id
+                node["data"] = data
+
+            parent_ref = str(planned.get("parent") or "")
+            parent_id = label_to_id.get(parent_ref, parent_ref)
+            if not parent_id and str(node.get("parentId") or "") in type_by_id:
+                # Kept nodes rarely re-state containment — recover the parent
+                # from the deepcopied wrapper so entry-edge synthesis still
+                # counts this child.
+                parent_id = str(node["parentId"])
+            if parent_id:
+                child_index = len(children_by_parent.get(parent_id, []))
+                node["parentId"] = parent_id
+                node.setdefault("position", {"x": 240 + 260 * child_index, "y": 60})
+                node.setdefault("data", {})
+                parent_type = type_by_id.get(parent_id)
+                if parent_type == BuiltinNodeTypes.ITERATION:
+                    node["data"].setdefault("isInIteration", True)
+                    node["data"].setdefault("iteration_id", parent_id)
+                elif parent_type == BuiltinNodeTypes.LOOP:
+                    node["data"].setdefault("isInLoop", True)
+                    node["data"].setdefault("loop_id", parent_id)
+                children_by_parent.setdefault(parent_id, []).append(node_id)
+            elif node.get("parentId"):
+                # The container was dropped from the plan: strip the stale
+                # containment markers so the kept node rejoins the top level
+                # (and its auto-layout) instead of pointing at a deleted parent.
+                for wrapper_key in ("parentId", "extent", "zIndex", "position", "positionAbsolute"):
+                    node.pop(wrapper_key, None)
+                if isinstance(node.get("data"), dict):
+                    for marker_key in ("isInIteration", "iteration_id", "isInLoop", "loop_id"):
+                        node["data"].pop(marker_key, None)
+
+            nodes.append(node)
+            if node_type in cls._CONTAINER_TYPES:
+                start_id = f"{node_id}start"
+                node.setdefault("data", {})["start_node_id"] = start_id
+                node.setdefault("width", 808)
+                node.setdefault("height", 204)
+                node.setdefault("zIndex", 1)
+                is_iteration = node_type == BuiltinNodeTypes.ITERATION
+                nodes.append(
+                    {
+                        "id": start_id,
+                        "type": "custom-iteration-start" if is_iteration else "custom-loop-start",
+                        "parentId": node_id,
+                        "extent": "parent",
+                        "draggable": False,
+                        "selectable": False,
+                        "zIndex": 1002,
+                        "position": {"x": 60, "y": 78},
+                        "data": {
+                            "type": "iteration-start" if is_iteration else "loop-start",
+                            "title": "",
+                            "desc": "",
+                            "selected": False,
+                            "isInIteration" if is_iteration else "isInLoop": True,
+                        },
+                    }
+                )
+
+        edges: list[dict[str, Any]] = []
+        for planned_edge in plan_edges:
+            edge: dict[str, Any] = {
+                "source": str(planned_edge.get("source") or ""),
+                "target": str(planned_edge.get("target") or ""),
+            }
+            source_handle = planned_edge.get("source_handle") or planned_edge.get("sourceHandle")
+            target_handle = planned_edge.get("target_handle") or planned_edge.get("targetHandle")
+            if source_handle:
+                edge["sourceHandle"] = str(source_handle)
+            if target_handle:
+                edge["targetHandle"] = str(target_handle)
+            edges.append(edge)
+
+        # Synthesize each container's entry edge. Refine keeps the existing
+        # entry target when it is still a child — the planner's node listing
+        # order says nothing about execution order inside a kept container.
+        planned_sources = {str(edge.get("source") or "") for edge in edges}
+        existing_entry_targets = {
+            str(edge.get("source") or ""): str(edge.get("target") or "") for edge in (existing_edges or [])
+        }
+        for parent_id, child_ids in children_by_parent.items():
+            start_id = f"{parent_id}start"
+            if not child_ids or start_id in planned_sources:
+                continue
+            preferred = existing_entry_targets.get(start_id, "")
+            entry_target = preferred if preferred in child_ids else child_ids[0]
+            edges.append({"source": start_id, "target": entry_target})
+
+        return cast(GraphDict, {"nodes": nodes, "edges": edges, "viewport": _DEFAULT_VIEWPORT})
 
     # ------------------------------------------------------------------
     # Postprocessing
@@ -1225,6 +1552,11 @@ class WorkflowGenerator:
             return var == "output"
         if node_type == BuiltinNodeTypes.LIST_OPERATOR:
             return var in {"result", "first_record", "last_record"}
+        if node_type == BuiltinNodeTypes.HUMAN_INPUT:
+            return any(
+                isinstance(item, dict) and item.get("output_variable_name") == var
+                for item in (data.get("inputs") or [])
+            )
         # Other node types (if-else, iteration-start, loop-start, ...) don't
         # produce outputs of their own.
         return False
@@ -1247,6 +1579,15 @@ class WorkflowGenerator:
                 if isinstance(parameter, dict) and isinstance(parameter.get("name"), str)
             ]
             return parameters[0] if len(parameters) == 1 else None
+        if node_type == BuiltinNodeTypes.HUMAN_INPUT:
+            human_outputs: list[str] = []
+            for item in data.get("inputs") or []:
+                if not isinstance(item, dict):
+                    continue
+                output_name = item.get("output_variable_name")
+                if isinstance(output_name, str):
+                    human_outputs.append(output_name)
+            return human_outputs[0] if len(human_outputs) == 1 else None
         if not isinstance(node_type, str):
             return None
         single_output_by_type: dict[str, str] = {
@@ -1533,6 +1874,12 @@ class WorkflowGenerator:
                     for klass in (data.get("classes") or [])
                     if isinstance(klass, dict) and klass.get("id")
                 ]
+            elif node_type == BuiltinNodeTypes.HUMAN_INPUT:
+                branch_handles = [
+                    str(action["id"])
+                    for action in (data.get("user_actions") or [])
+                    if isinstance(action, dict) and action.get("id")
+                ]
             else:
                 continue
 
@@ -1941,8 +2288,8 @@ class WorkflowGenerator:
         """
         Validate iteration / loop topology:
 
-          * every container has at least one child whose ``parentId``
-            points at it;
+          * every container has at least one executable child whose
+            ``parentId`` points at it;
           * every non-container node with a ``parentId`` points at a real
             container, not at a non-container node;
           * no cycles in the parent chain (a node cannot be its own
@@ -1959,7 +2306,9 @@ class WorkflowGenerator:
             if not isinstance(parent, str) or not parent:
                 continue
             if parent in container_ids:
-                children_by_parent.setdefault(parent, []).append(n.get("id", ""))
+                node_type = (n.get("data") or {}).get("type")
+                if node_type not in {"iteration-start", "loop-start"}:
+                    children_by_parent.setdefault(parent, []).append(n.get("id", ""))
             elif parent in by_id:
                 # Parent exists but isn't a container — that's a topology bug.
                 out.append(

api/core/workflow/generator/types.py

@@ -1,10 +1,10 @@
 """
 Typed payloads for workflow generation.
 
-These TypedDicts describe the shape that the planner and builder LLM calls are
-required to return after ``json_repair`` parsing. They mirror the runtime
-``graph`` shape consumed by ``WorkflowService.sync_draft_workflow`` so the output
-can be written straight into a draft workflow without further translation.
+These TypedDicts describe the planner payload and the runtime graph assembled
+from builder LLM responses after ``json_repair`` parsing. The graph types mirror
+the shape consumed by ``WorkflowService.sync_draft_workflow`` so the output can
+be written straight into a draft workflow.
 """
 
 from enum import StrEnum
@@ -12,11 +12,10 @@ from typing import Literal, NotRequired, TypedDict
 
 WorkflowGenerationMode = Literal["workflow", "advanced-chat"]
 
-# The mode accepted at the API boundary. ``auto`` is a sentinel that asks the
-# service to classify the instruction into a concrete ``WorkflowGenerationMode``
-# (one tiny LLM call) BEFORE planning — see
-# ``WorkflowGeneratorService._resolve_mode`` and
-# ``LLMGenerator.classify_workflow_mode``.
+# The mode accepted at the API boundary. ``auto`` is a sentinel that delegates
+# the choice to the planner: it echoes a concrete mode in its ``mode`` output
+# field (falling back to terminal-node inference, then ``advanced-chat``) —
+# see ``runner._resolve_generation_mode``. No extra LLM call is involved.
 WorkflowGenerationModeRequest = Literal["workflow", "advanced-chat", "auto"]
 
 
@@ -58,9 +57,21 @@ class WorkflowGenerateErrorDict(TypedDict):
 class PlannerNodeDict(TypedDict):
     """One node from the planner's high-level plan."""
 
+    id: NotRequired[str]
     label: str
     node_type: str
     purpose: str
+    parent: NotRequired[str]
+    action: NotRequired[Literal["keep", "update", "add"]]
+
+
+class PlannerEdgeDict(TypedDict):
+    """Compact topology emitted by the planner for parallel node building."""
+
+    source: str
+    target: str
+    source_handle: NotRequired[str]
+    target_handle: NotRequired[str]
 
 
 class PlannerStartInputDict(TypedDict):
@@ -82,10 +93,15 @@ class PlannerResultDict(TypedDict):
 
     title: str
     description: str
+    # Concrete mode the planner chose ("workflow" / "advanced-chat"). Parsed
+    # leniently — an ``auto`` request infers the mode from the terminal node
+    # when this is missing or invalid, so a bad value never fails the plan.
+    mode: NotRequired[str]
     app_name: NotRequired[str]
     icon: NotRequired[str]
     start_inputs: NotRequired[list[PlannerStartInputDict]]
     nodes: list[PlannerNodeDict]
+    edges: NotRequired[list[PlannerEdgeDict]]
 
 
 class GraphNodePositionDict(TypedDict):

api/dev/generate_knowledge_fs_contract.py

@@ -0,0 +1,229 @@
+"""Validate Dify Console KnowledgeFS declarations against a pinned OpenAPI document.
+
+The OpenAPI document is exported only during development and CI. Runtime declarations live with Dify product policy;
+this module validates their transport metadata without generating a complete operation catalog.
+"""
+
+from __future__ import annotations
+
+import argparse
+import hashlib
+import json
+import os
+import subprocess
+import tempfile
+from pathlib import Path
+from typing import Any, Literal, TypedDict
+
+API_ROOT = Path(__file__).resolve().parents[1]
+WORKSPACE_ROOT = API_ROOT.parent
+LOCK_PATH = API_ROOT / "knowledge-fs-contract.lock.json"
+DEFAULT_REPOSITORY = WORKSPACE_ROOT.parent / "knowledge-fs"
+OPENAPI_METHODS = ("delete", "get", "head", "options", "patch", "post", "put", "trace")
+PROXY_METHODS = frozenset({"delete", "get", "patch", "post", "put"})
+
+
+class ContractDeclaration(TypedDict):
+    """KnowledgeFS transport contract declared by one Dify Console registry entry."""
+
+    operation_id: str
+    method: str
+    path: str
+    required_scope: str | None
+    response_kind: str
+    max_response_bytes: int
+    request_headers: tuple[str, ...]
+    response_headers: tuple[str, ...]
+    response_media_types: tuple[str, ...]
+
+
+type DeclarationField = Literal[
+    "method",
+    "path",
+    "required_scope",
+    "response_kind",
+    "max_response_bytes",
+    "request_headers",
+    "response_headers",
+    "response_media_types",
+]
+
+DECLARATION_FIELDS: tuple[DeclarationField, ...] = (
+    "method",
+    "path",
+    "required_scope",
+    "response_kind",
+    "max_response_bytes",
+    "request_headers",
+    "response_headers",
+    "response_media_types",
+)
+
+
+def main() -> None:
+    """Update or verify the pinned KnowledgeFS commit and OpenAPI hash."""
+    parser = argparse.ArgumentParser()
+    mode = parser.add_mutually_exclusive_group()
+    mode.add_argument("--check", action="store_true")
+    mode.add_argument("--update-lock", action="store_true")
+    args = parser.parse_args()
+
+    repository = Path(os.environ.get("KNOWLEDGE_FS_REPO", DEFAULT_REPOSITORY)).resolve()
+    lock = json.loads(LOCK_PATH.read_text())
+    tracked_changes = run("git", "status", "--porcelain", "--untracked-files=no", cwd=repository).strip()
+    if tracked_changes:
+        raise RuntimeError("KnowledgeFS checkout must not contain tracked changes during contract export")
+
+    commit = run("git", "rev-parse", "HEAD", cwd=repository).strip()
+    if not args.update_lock and commit != lock["commit"]:
+        raise RuntimeError(
+            f"KnowledgeFS checkout mismatch: expected {lock['commit']}, received {commit}. "
+            "Use the pinned commit or pass --update-lock intentionally."
+        )
+
+    with tempfile.TemporaryDirectory(prefix="dify-knowledge-fs-contract-") as directory:
+        openapi_path = Path(directory) / "knowledge-fs.openapi.json"
+        subprocess.run(
+            ["pnpm", "openapi:export", "--", "--output", str(openapi_path)],
+            cwd=repository,
+            check=True,
+        )
+        openapi_content = openapi_path.read_bytes()
+
+    openapi_sha256 = sha256(openapi_content)
+    if args.update_lock:
+        LOCK_PATH.write_text(
+            json.dumps(
+                {
+                    "commit": commit,
+                    "openapiSha256": openapi_sha256,
+                    "repository": lock["repository"],
+                },
+                indent=2,
+            )
+            + "\n"
+        )
+        return
+
+    if openapi_sha256 != lock["openapiSha256"]:
+        raise RuntimeError(
+            f"KnowledgeFS OpenAPI hash mismatch: expected {lock['openapiSha256']}, received {openapi_sha256}"
+        )
+
+
+def validate_declarations(document: dict[str, Any], declarations: tuple[ContractDeclaration, ...]) -> None:
+    """Validate Dify Console declarations against matching pinned OpenAPI operations."""
+    operations_by_id: dict[str, list[tuple[str, str, dict[str, Any], dict[str, Any]]]] = {}
+    for path, path_item in document.get("paths", {}).items():
+        for method in OPENAPI_METHODS:
+            operation = path_item.get(method)
+            if operation is None:
+                continue
+            operation_id = operation.get("operationId")
+            if isinstance(operation_id, str) and operation_id:
+                operations_by_id.setdefault(operation_id, []).append((method, path, path_item, operation))
+
+    declared_ids: set[str] = set()
+    for declaration in declarations:
+        operation_id = declaration["operation_id"]
+        if operation_id in declared_ids:
+            raise ValueError(f"Dify Console registry has duplicate operationId: {operation_id}")
+        declared_ids.add(operation_id)
+
+        matches = operations_by_id.get(operation_id, [])
+        if not matches:
+            raise ValueError(f"KnowledgeFS OpenAPI has no operationId: {operation_id}")
+        if len(matches) > 1:
+            raise ValueError(f"KnowledgeFS OpenAPI has duplicate operationId: {operation_id}")
+
+        method, path, path_item, operation = matches[0]
+        if not path.startswith("/"):
+            raise ValueError(f"KnowledgeFS OpenAPI path must be absolute: {path}")
+        if method not in PROXY_METHODS:
+            raise ValueError(f"KnowledgeFS proxy does not support {method.upper()} {path}")
+        expected: ContractDeclaration = {
+            "operation_id": operation_id,
+            "method": method.upper(),
+            "path": path[1:],
+            "required_scope": required_scope(operation),
+            "response_kind": response_kind(operation),
+            "max_response_bytes": required_max_response_bytes(operation),
+            "request_headers": request_header_names(path_item, operation),
+            "response_headers": response_header_names(operation),
+            "response_media_types": response_media_types(operation),
+        }
+        for field in DECLARATION_FIELDS:
+            expected_value = expected[field]
+            received_value = declaration[field]
+            if received_value != expected_value:
+                raise ValueError(
+                    f"KnowledgeFS operation {operation_id} field {field} drifted: "
+                    f"expected {expected_value!r}, received {received_value!r}"
+                )
+
+
+def response_kind(operation: dict[str, Any]) -> str:
+    media_types = response_media_types(operation)
+    if "text/event-stream" in media_types:
+        return "stream"
+    if "application/octet-stream" in media_types:
+        return "binary"
+    return "buffered"
+
+
+def response_media_types(operation: dict[str, Any]) -> tuple[str, ...]:
+    media_types: set[str] = set()
+    for status, response in operation.get("responses", {}).items():
+        if status == "2XX" or (len(status) == 3 and status.startswith("2") and status.isdigit()):
+            media_types.update(response.get("content", {}))
+    return tuple(sorted(media_types))
+
+
+def required_scope(operation: dict[str, Any]) -> str | None:
+    scope = operation.get("x-knowledge-fs-required-scope")
+    if scope in ("knowledge-spaces:read", "knowledge-spaces:write"):
+        return scope
+    if operation.get("security") == []:
+        return None
+    raise ValueError(f"KnowledgeFS operation has no supported required scope: {scope}")
+
+
+def required_max_response_bytes(operation: dict[str, Any]) -> int:
+    value = operation.get("x-knowledge-fs-max-response-bytes")
+    if not isinstance(value, int) or isinstance(value, bool) or value <= 0:
+        raise ValueError(f"KnowledgeFS operation has no valid response byte limit: {value}")
+    return value
+
+
+def request_header_names(path_item: dict[str, Any], operation: dict[str, Any]) -> tuple[str, ...]:
+    names: set[str] = set()
+    for parameter in [*path_item.get("parameters", []), *operation.get("parameters", [])]:
+        if "$ref" in parameter:
+            raise ValueError(f"KnowledgeFS request header references are not supported: {parameter['$ref']}")
+        if parameter.get("in") == "header":
+            names.add(parameter["name"].lower())
+    return tuple(sorted(names))
+
+
+def response_header_names(operation: dict[str, Any]) -> tuple[str, ...]:
+    return tuple(
+        sorted(
+            {
+                name.lower()
+                for response in operation.get("responses", {}).values()
+                for name in response.get("headers", {})
+            }
+        )
+    )
+
+
+def sha256(content: bytes) -> str:
+    return hashlib.sha256(content).hexdigest()
+
+
+def run(*command: str, cwd: Path) -> str:
+    return subprocess.run(command, cwd=cwd, check=True, capture_output=True, text=True).stdout
+
+
+if __name__ == "__main__":
+    main()

api/events/event_handlers/__init__.py

@@ -7,6 +7,9 @@ from .delete_tool_parameters_cache_when_sync_draft_workflow import (
     handle as handle_delete_tool_parameters_cache_when_sync_draft_workflow,
 )
 from .queue_credential_sync_when_tenant_created import handle as handle_queue_credential_sync_when_tenant_created
+from .queue_default_plugin_install_when_tenant_created import (
+    handle as handle_queue_default_plugin_install_when_tenant_created,
+)
 from .sync_plugin_trigger_when_app_created import handle as handle_sync_plugin_trigger_when_app_created
 from .sync_webhook_when_app_created import handle as handle_sync_webhook_when_app_created
 from .sync_workflow_schedule_when_app_published import handle as handle_sync_workflow_schedule_when_app_published
@@ -32,6 +35,7 @@ __all__ = [
     "handle_create_site_record_when_app_created",
     "handle_delete_tool_parameters_cache_when_sync_draft_workflow",
     "handle_queue_credential_sync_when_tenant_created",
+    "handle_queue_default_plugin_install_when_tenant_created",
     "handle_sync_plugin_trigger_when_app_created",
     "handle_sync_webhook_when_app_created",
     "handle_sync_workflow_schedule_when_app_published",

api/events/event_handlers/queue_default_plugin_install_when_tenant_created.py

@@ -0,0 +1,22 @@
+"""Queue default marketplace plugin installation after tenant creation."""
+
+import logging
+
+from configs import dify_config
+from events.tenant_event import tenant_was_created
+from tasks.install_default_plugins_task import install_default_plugins_task
+
+logger = logging.getLogger(__name__)
+
+
+@tenant_was_created.connect
+def handle(sender, **kwargs) -> None:
+    """Keep tenant creation non-blocking while installing configured plugins asynchronously."""
+    plugin_ids = dify_config.NEW_USER_DEFAULT_PLUGIN_ID_LIST
+    if not plugin_ids:
+        return
+
+    try:
+        install_default_plugins_task.delay(sender.id, plugin_ids)
+    except Exception:
+        logger.exception("Failed to queue default plugin installation for tenant %s", sender.id)

api/extensions/ext_celery.py

@@ -156,6 +156,7 @@ def init_app(app: DifyApp) -> Celery:
         "tasks.generate_summary_index_task",  # summary index generation
         "tasks.regenerate_summary_index_task",  # summary index regeneration
         "tasks.initialize_created_app_rbac_access_task",  # app access initialization
+        "tasks.install_default_plugins_task",  # tenant default plugin installation
         "tasks.app_generate.resume_agent_app_task",  # ENG-635: Agent v2 chat ask_human resume
         "tasks.workflow_run_archive_download_tasks",  # workflow-run archive download preparation
     ]

api/extensions/logstore/repositories/logstore_workflow_execution_repository.py

@@ -12,7 +12,6 @@ from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchem
 from extensions.logstore.aliyun_logstore import AliyunLogStore
 from graphon.entities import WorkflowExecution
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from libs.helper import extract_tenant_id
 from models import (
     Account,
     CreatorUserRole,
@@ -27,6 +26,7 @@ class LogstoreWorkflowExecutionRepository(WorkflowExecutionRepository):
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowRunTriggeredFrom | None,
@@ -36,7 +36,8 @@ class LogstoreWorkflowExecutionRepository(WorkflowExecutionRepository):
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for creating sessions
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (DEBUGGING or APP_RUN)
         """
@@ -47,10 +48,8 @@ class LogstoreWorkflowExecutionRepository(WorkflowExecutionRepository):
         # Note: Project/logstore/index initialization is done at app startup via ext_logstore
         self.logstore_client = AliyunLogStore()
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context
@@ -64,7 +63,13 @@ class LogstoreWorkflowExecutionRepository(WorkflowExecutionRepository):
         self._creator_user_role = CreatorUserRole.ACCOUNT if isinstance(user, Account) else CreatorUserRole.END_USER
 
         # Initialize SQL repository for dual-write support
-        self.sql_repository = SQLAlchemyWorkflowExecutionRepository(session_factory, user, app_id, triggered_from)
+        self.sql_repository = SQLAlchemyWorkflowExecutionRepository(
+            session_factory=session_factory,
+            tenant_id=tenant_id,
+            user=user,
+            app_id=app_id,
+            triggered_from=triggered_from,
+        )
 
         # Control flag for dual-write (write to both LogStore and SQL database)
         # Set to True to enable dual-write for safe migration, False to use LogStore only

api/extensions/logstore/repositories/logstore_workflow_node_execution_repository.py

@@ -26,7 +26,6 @@ from graphon.entities import WorkflowNodeExecution
 from graphon.enums import WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.model_runtime.utils.encoders import jsonable_encoder
 from graphon.workflow_type_encoder import WorkflowRuntimeTypeConverter
-from libs.helper import extract_tenant_id
 from models import (
     Account,
     CreatorUserRole,
@@ -109,6 +108,7 @@ class LogstoreWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
     def __init__(
         self,
         session_factory: sessionmaker | Engine,
+        tenant_id: str,
         user: Account | EndUser,
         app_id: str | None,
         triggered_from: WorkflowNodeExecutionTriggeredFrom | None,
@@ -118,7 +118,8 @@ class LogstoreWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
 
         Args:
             session_factory: SQLAlchemy sessionmaker or engine for creating sessions
-            user: Account or EndUser object containing tenant_id, user ID, and role information
+            tenant_id: Tenant that owns the workflow node execution
+            user: Account or EndUser used for creator attribution
             app_id: App ID for filtering by application (can be None)
             triggered_from: Source of the execution trigger (SINGLE_STEP or WORKFLOW_RUN)
         """
@@ -128,10 +129,8 @@ class LogstoreWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
         # Initialize LogStore client
         self.logstore_client = AliyunLogStore()
 
-        # Extract tenant_id from user
-        tenant_id = extract_tenant_id(user)
         if not tenant_id:
-            raise ValueError("User must have a tenant_id or current_tenant_id")
+            raise ValueError("tenant_id is required")
         self._tenant_id = tenant_id
 
         # Store app context
@@ -145,7 +144,13 @@ class LogstoreWorkflowNodeExecutionRepository(WorkflowNodeExecutionRepository):
         self._creator_user_role = CreatorUserRole.ACCOUNT if isinstance(user, Account) else CreatorUserRole.END_USER
 
         # Initialize SQL repository for dual-write support
-        self.sql_repository = SQLAlchemyWorkflowNodeExecutionRepository(session_factory, user, app_id, triggered_from)
+        self.sql_repository = SQLAlchemyWorkflowNodeExecutionRepository(
+            session_factory=session_factory,
+            tenant_id=tenant_id,
+            user=user,
+            app_id=app_id,
+            triggered_from=triggered_from,
+        )
 
         # Control flag for dual-write (write to both LogStore and SQL database)
         # Set to True to enable dual-write for safe migration, False to use LogStore only

api/fields/conversation_variable_fields.py

@@ -60,6 +60,21 @@ class ConversationVariableResponse(ResponseModel):
         return to_timestamp(value)
 
 
+class WorkflowConversationVariableResponse(ResponseModel):
+    id: str
+    name: str
+    value_type: str
+    value: Any
+    description: str
+
+    @field_validator("value_type", mode="before")
+    @classmethod
+    def _serialize_value_type(cls, value: Any) -> str:
+        if hasattr(value, "exposed_type"):
+            return str(value.exposed_type())
+        return str(value)
+
+
 class PaginatedConversationVariableResponse(ResponseModel):
     page: int
     limit: int

api/knowledge-fs-contract.lock.json

@@ -0,0 +1,5 @@
+{
+  "commit": "4310e2d582d25e7de58183f27720afab01e123cf",
+  "openapiSha256": "5827ca930ce38462bfd1b2bef387efbf37eb7ffcaedde4558af2fbaeccbfbc4b",
+  "repository": "https://github.com/langgenius/knowledge-fs"
+}

api/models/agent_config_entities.py

@@ -188,6 +188,14 @@ def validate_config_skill_name(name: str) -> str:
     return normalized
 
 
+def _normalize_legacy_missing_asset_file_id(value: Any) -> Any:
+    """Canonicalize the null placeholder emitted by early portable Agent DSLs."""
+
+    if isinstance(value, dict) and value.get("is_missing") is True and value.get("file_id") is None:
+        return {**value, "file_id": ""}
+    return value
+
+
 class AgentConfigFileRefConfig(BaseModel):
     """Stable Agent Soul reference to one config file payload."""
 
@@ -201,6 +209,11 @@ class AgentConfigFileRefConfig(BaseModel):
     hash: str | None = None
     mime_type: str | None = None
 
+    @model_validator(mode="before")
+    @classmethod
+    def _normalize_legacy_file_id(cls, value: Any) -> Any:
+        return _normalize_legacy_missing_asset_file_id(value)
+
     @field_validator("name")
     @classmethod
     def _validate_name(cls, value: str) -> str:
@@ -231,6 +244,11 @@ class AgentConfigSkillRefConfig(BaseModel):
     hash: str | None = None
     mime_type: str | None = "application/zip"
 
+    @model_validator(mode="before")
+    @classmethod
+    def _normalize_legacy_file_id(cls, value: Any) -> Any:
+        return _normalize_legacy_missing_asset_file_id(value)
+
     @field_validator("name")
     @classmethod
     def _validate_name(cls, value: str) -> str:

api/openapi/markdown/console-openapi.md

@@ -22008,6 +22008,7 @@ Tag type
 | role | string |  | No |
 | status | string |  | No |
 | trial_credits | integer |  | No |
+| trial_credits_exhausted_at | integer |  | No |
 | trial_credits_used | integer |  | No |
 | trial_end_reason | string |  | No |
 
@@ -22557,7 +22558,7 @@ Enum class for tool provider
 
 | Name | Type | Description | Required |
 | ---- | ---- | ----------- | -------- |
-| conversation_variables | [ [JsonObject](#jsonobject) ] |  | No |
+| conversation_variables | [ [WorkflowConversationVariableResponse](#workflowconversationvariableresponse) ] |  | No |
 | created_at | integer |  | No |
 | created_by | [TrialSimpleAccount](#trialsimpleaccount) |  | No |
 | environment_variables | [ [JsonObject](#jsonobject) ] |  | No |

api/providers/trace/trace-aliyun/src/dify_trace_aliyun/aliyun_trace.py

@@ -296,6 +296,7 @@ class AliyunDataTrace(BaseTraceInstance):
         session_factory = sessionmaker(bind=db.engine)
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-arize-phoenix/src/dify_trace_arize_phoenix/arize_phoenix_trace.py

@@ -845,6 +845,7 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-langfuse/src/dify_trace_langfuse/langfuse_trace.py

@@ -186,6 +186,7 @@ class LangFuseDataTrace(BaseTraceInstance):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-langsmith/src/dify_trace_langsmith/langsmith_trace.py

@@ -154,6 +154,7 @@ class LangSmithDataTrace(BaseTraceInstance):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-opik/src/dify_trace_opik/opik_trace.py

@@ -174,6 +174,7 @@ class OpikDataTrace(BaseTraceInstance):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-tencent/src/dify_trace_tencent/tencent_trace.py

@@ -252,18 +252,9 @@ class TencentDataTrace(BaseTraceInstance):
                 if not service_account:
                     raise ValueError(f"Creator account not found for app {app_id}")
 
-                current_tenant = session.scalar(
-                    select(TenantAccountJoin)
-                    .where(TenantAccountJoin.account_id == service_account.id, TenantAccountJoin.current.is_(True))
-                    .limit(1)
-                )
-                if not current_tenant:
-                    raise ValueError(f"Current tenant not found for account {service_account.id}")
-
-                service_account.set_tenant_id_with_session(current_tenant.tenant_id, session=session)
-
             repository = SQLAlchemyWorkflowNodeExecutionRepository(
                 session_factory=session_maker,
+                tenant_id=app.tenant_id,
                 user=service_account,
                 app_id=trace_info.metadata.get("app_id"),
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/providers/trace/trace-tencent/tests/unit_tests/tencent_trace/test_tencent_trace.py

@@ -18,7 +18,7 @@ from core.ops.entities.trace_entity import (
 )
 from graphon.entities import WorkflowNodeExecution
 from graphon.enums import BuiltinNodeTypes
-from models import Account, App, TenantAccountJoin
+from models import Account, App
 
 logger = logging.getLogger(__name__)
 
@@ -420,20 +420,18 @@ class TestTencentDataTrace:
         app = MagicMock(spec=App)
         app.id = "app-1"
         app.created_by = "user-1"
+        app.tenant_id = "tenant-1"
 
         account = MagicMock(spec=Account)
         account.id = "user-1"
 
-        tenant_join = MagicMock(spec=TenantAccountJoin)
-        tenant_join.tenant_id = "tenant-1"
-
         mock_executions = [MagicMock()]
 
         with patch("dify_trace_tencent.tencent_trace.db") as mock_db:
             mock_db.engine = "engine"
             with patch("dify_trace_tencent.tencent_trace.Session") as mock_session_ctx:
                 session = mock_session_ctx.return_value.__enter__.return_value
-                session.scalar.side_effect = [app, account, tenant_join]
+                session.scalar.side_effect = [app, account]
 
                 with patch("dify_trace_tencent.tencent_trace.SQLAlchemyWorkflowNodeExecutionRepository") as mock_repo:
                     mock_repo.return_value.get_by_workflow_execution.return_value = mock_executions
@@ -441,7 +439,7 @@ class TestTencentDataTrace:
                     results = tencent_data_trace._get_workflow_node_executions(trace_info)
 
                     assert results == mock_executions
-                    account.set_tenant_id_with_session.assert_called_once_with("tenant-1", session=session)
+                    assert mock_repo.call_args.kwargs["tenant_id"] == "tenant-1"
 
     def test_get_workflow_node_executions_no_app_id(self, tencent_data_trace, caplog: pytest.LogCaptureFixture):
         trace_info = MagicMock(spec=WorkflowTraceInfo)

api/providers/trace/trace-weave/src/dify_trace_weave/weave_trace.py

@@ -159,6 +159,7 @@ class WeaveDataTrace(BaseTraceInstance):
 
         workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=session_factory,
+            tenant_id=trace_info.tenant_id,
             user=service_account,
             app_id=app_id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/services/account_service.py

@@ -1297,7 +1297,7 @@ class TenantService:
     def create_owner_tenant_if_not_exist(
         account: Account, name: str | None = None, is_setup: bool | None = False, *, session: Session
     ):
-        """Check if user have a workspace or not"""
+        """Create an owner workspace only when the account has no membership."""
         available_ta = session.scalar(
             select(TenantAccountJoin)
             .where(TenantAccountJoin.account_id == account.id)
@@ -1308,8 +1308,28 @@ class TenantService:
         if available_ta:
             return
 
-        """Create owner tenant if not exist"""
-        if not FeatureService.get_system_features().is_allow_create_workspace and not is_setup:
+        TenantService.create_owner_tenant(account, name=name, is_setup=is_setup, session=session)
+
+    @staticmethod
+    def create_owner_tenant(
+        account: Account,
+        name: str | None = None,
+        is_setup: bool | None = False,
+        is_from_dashboard: bool | None = False,
+        *,
+        session: Session,
+    ) -> Tenant:
+        """Create an owner workspace and bind its owner RBAC role when enabled.
+
+        This is the single write path for a newly created workspace with an
+        owner. It persists the legacy membership before creating the matching
+        RBAC role binding, then makes the workspace current for the account.
+        """
+        if (
+            not FeatureService.get_system_features().is_allow_create_workspace
+            and not is_setup
+            and not is_from_dashboard
+        ):
             raise WorkSpaceNotAllowedCreateError()
 
         workspaces = FeatureService.get_system_features().license.workspaces
@@ -1317,9 +1337,19 @@ class TenantService:
             raise WorkspacesLimitExceededError()
 
         if name:
-            tenant = TenantService.create_tenant(name=name, is_setup=is_setup, session=session)
+            tenant = TenantService.create_tenant(
+                name=name,
+                is_setup=is_setup,
+                is_from_dashboard=is_from_dashboard,
+                session=session,
+            )
         else:
-            tenant = TenantService.create_tenant(name=f"{account.name}'s Workspace", is_setup=is_setup, session=session)
+            tenant = TenantService.create_tenant(
+                name=f"{account.name}'s Workspace",
+                is_setup=is_setup,
+                is_from_dashboard=is_from_dashboard,
+                session=session,
+            )
         TenantService.create_tenant_member(tenant, account, session, role="owner")
         if dify_config.RBAC_ENABLED:
             owner_role_id = AccountService._resolve_legacy_role_id(str(tenant.id), account.id, TenantAccountRole.OWNER)
@@ -1333,6 +1363,7 @@ class TenantService:
         account.set_current_tenant_with_session(tenant, session=session)
         session.commit()
         tenant_was_created.send(tenant)
+        return tenant
 
     @staticmethod
     def create_tenant_member(
@@ -1984,10 +2015,7 @@ class RegisterService:
                 and FeatureService.get_system_features().license.workspaces.is_available()
             ):
                 try:
-                    tenant = TenantService.create_tenant(f"{account.name}'s Workspace", session=session)
-                    TenantService.create_tenant_member(tenant, account, session, role="owner")
-                    account.set_current_tenant_with_session(tenant, session=session)
-                    tenant_was_created.send(tenant)
+                    TenantService.create_owner_tenant(account, session=session)
                 except Exception:
                     _try_join_enterprise_default_workspace(str(account.id))
                     raise

api/services/agent/dsl_service.py

@@ -11,17 +11,14 @@ from __future__ import annotations
 
 import copy
 import json
-import logging
 from collections.abc import Mapping
 from typing import Any, cast
 
 from pydantic import BaseModel, ConfigDict, Field
-from sqlalchemy import event, func, select
+from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
-from constants.model_template import default_app_templates
 from core.workflow.nodes.agent_v2.validators import WorkflowAgentNodeValidator
-from events.app_event import app_was_created
 from graphon.enums import BuiltinNodeTypes
 from models import Account
 from models.agent import (
@@ -41,7 +38,7 @@ from models.agent import (
     WorkflowAgentNodeBinding,
 )
 from models.agent_config_entities import AgentSoulConfig, WorkflowNodeJobConfig
-from models.model import App, AppMode, AppModelConfig, IconType
+from models.model import App, AppModelConfig
 from models.workflow import Workflow
 from services.agent.agent_soul_state import agent_soul_has_model
 from services.agent.dsl_entities import (
@@ -57,8 +54,6 @@ from services.agent.roster_service import AgentRosterService
 from services.entities.dsl_entities import DslImportWarning
 from services.plugin.dependencies_analysis import DependenciesAnalysisService
 
-logger = logging.getLogger(__name__)
-
 
 class AgentPackageImportResult(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -249,7 +244,7 @@ class AgentDslService:
         raw_packages: Mapping[str, Any],
         account: Account,
     ) -> tuple[dict[str, Any], list[DslImportWarning]]:
-        """Materialize packages and bindings for a Workflow or Snippet draft."""
+        """Materialize every packaged Agent as a node-owned inline Agent."""
 
         graph = copy.deepcopy(dict(portable_graph))
         packages = {key: AgentPackage.model_validate(value) for key, value in raw_packages.items()}
@@ -264,7 +259,6 @@ class AgentDslService:
         for binding in previous_bindings:
             self.session.delete(binding)
         self.session.flush()
-        imported_roster: dict[str, AgentPackageImportResult] = {}
         warnings: list[DslImportWarning] = []
 
         for node_id, raw_node_data in WorkflowAgentNodeValidator.iter_agent_v2_nodes(graph):
@@ -280,28 +274,17 @@ class AgentDslService:
                 raise ValueError(f"Workflow Agent node {node_id} references unknown package {package_ref!r}.")
 
             try:
-                binding_type = WorkflowAgentBindingType(str(raw_binding.get("binding_type")))
+                WorkflowAgentBindingType(str(raw_binding.get("binding_type")))
             except ValueError as exc:
                 raise ValueError(f"Workflow Agent node {node_id} has an invalid binding type.") from exc
 
-            if binding_type == WorkflowAgentBindingType.ROSTER_AGENT:
-                imported = imported_roster.get(package_ref)
-                if imported is None:
-                    imported = self._create_imported_roster_agent_app(
-                        tenant_id=workflow.tenant_id,
-                        account=account,
-                        package=package,
-                        package_path=f"agent_packages.{package_ref}",
-                    )
-                    imported_roster[package_ref] = imported
-            else:
-                imported = self._create_imported_inline_agent(
-                    workflow=workflow,
-                    node_id=node_id,
-                    account=account,
-                    package=package,
-                    package_path=f"agent_packages.{package_ref}",
-                )
+            imported = self._create_imported_inline_agent(
+                workflow=workflow,
+                node_id=node_id,
+                account=account,
+                package=package,
+                package_path=f"agent_packages.{package_ref}",
+            )
 
             node_job = WorkflowNodeJobConfig.model_validate(node_data.get(AGENT_NODE_JOB_DSL_KEY) or {})
             self.session.add(
@@ -311,7 +294,7 @@ class AgentDslService:
                     workflow_id=workflow.id,
                     workflow_version=workflow.version,
                     node_id=node_id,
-                    binding_type=binding_type,
+                    binding_type=WorkflowAgentBindingType.INLINE_AGENT,
                     agent_id=imported.agent.id,
                     current_snapshot_id=imported.snapshot.id,
                     node_job_config=node_job,
@@ -320,7 +303,7 @@ class AgentDslService:
                 )
             )
             node_data["agent_binding"] = {
-                "binding_type": binding_type.value,
+                "binding_type": WorkflowAgentBindingType.INLINE_AGENT.value,
                 "agent_id": imported.agent.id,
                 "current_snapshot_id": imported.snapshot.id,
             }
@@ -402,43 +385,6 @@ class AgentDslService:
                     )
         return dependencies
 
-    def _create_imported_roster_agent_app(
-        self,
-        *,
-        tenant_id: str,
-        account: Account,
-        package: AgentPackage,
-        package_path: str,
-    ) -> AgentPackageImportResult:
-        metadata = package.metadata
-        app_template = dict(default_app_templates[AppMode.AGENT]["app"])
-        app = App(**app_template)
-        app.name = metadata.name
-        app.description = metadata.description
-        app.mode = AppMode.AGENT
-        app.icon_type = self._app_icon_type(metadata.icon_type)
-        app.icon = metadata.icon
-        app.icon_background = metadata.icon_background
-        app.tenant_id = tenant_id
-        app.enable_site = True
-        app.enable_api = True
-        app.created_by = account.id
-        app.maintainer = account.id
-        app.updated_by = account.id
-        self.session.add(app)
-        self.session.flush()
-        app_was_created.send(app, account=account, session=self.session)
-        self._configure_visible_agent_app_after_commit(
-            tenant_id=tenant_id,
-            app_id=app.id,
-            account_id=account.id,
-        )
-        result = self.import_agent_app_package(app=app, account=account, package=package)
-        result.warnings = [
-            warning.model_copy(update={"path": f"{package_path}.{warning.path}"}) for warning in result.warnings
-        ]
-        return result
-
     def _create_imported_inline_agent(
         self,
         *,
@@ -654,28 +600,6 @@ class AgentDslService:
         )
         return next(candidate for candidate in candidates if candidate not in existing)
 
-    def _configure_visible_agent_app_after_commit(self, *, tenant_id: str, app_id: str, account_id: str) -> None:
-        """Apply external RBAC and web-app visibility only after the DB transaction commits."""
-
-        def configure(_session: Session) -> None:
-            try:
-                from services.enterprise import rbac_service as enterprise_rbac_service
-                from services.enterprise.enterprise_service import EnterpriseService
-                from services.feature_service import FeatureService
-
-                enterprise_rbac_service.try_sync_creator_access_policy_member_bindings(
-                    tenant_id,
-                    account_id,
-                    enterprise_rbac_service.RBACResourceType.APP,
-                    app_id,
-                )
-                if FeatureService.get_system_features().webapp_auth.enabled:
-                    EnterpriseService.WebAppAuth.update_app_access_mode(app_id, "private")
-            except Exception:
-                logger.exception("Failed to configure imported Agent App %s after commit", app_id)
-
-        event.listen(self.session, "after_commit", configure, once=True)
-
     def _require_agent(self, *, tenant_id: str, agent_id: str) -> Agent:
         agent = self.session.scalar(select(Agent).where(Agent.tenant_id == tenant_id, Agent.id == agent_id).limit(1))
         if agent is None:
@@ -702,10 +626,6 @@ class AgentDslService:
     def _agent_icon_type(value: str | None) -> AgentIconType | None:
         return AgentIconType(value) if value else None
 
-    @staticmethod
-    def _app_icon_type(value: str | None) -> IconType:
-        return IconType(value) if value else IconType.EMOJI
-
 
 def is_agent_v2_graph(graph: Mapping[str, Any]) -> bool:
     return any(

api/services/billing_service.py

@@ -55,6 +55,7 @@ class QuotaBalanceResult(TypedDict):
     reserved: int
     quota: int
     usage: int
+    exhausted_at: NotRequired[int]
 
 
 class QuotaConsumeCappedResult(TypedDict):

api/services/credit_pool_service.py

@@ -32,6 +32,7 @@ class CreditPoolBalance:
     pool_type: str
     quota_limit: int
     quota_used: int
+    exhausted_at: int | None = None
 
     @property
     def remaining_credits(self) -> int:
@@ -133,6 +134,7 @@ class CreditPoolService:
                 pool_type=normalized_pool_type,
                 quota_limit=balance["quota"],
                 quota_used=balance["usage"],
+                exhausted_at=balance.get("exhausted_at"),
             )
 
         session = cls._require_session(session)

api/services/file_service.py

@@ -53,6 +53,7 @@ class FileService:
         content: bytes,
         mimetype: str,
         user: Account | EndUser,
+        tenant_id: str | None = None,
         source: Literal["datasets"] | None = None,
         source_url: str = "",
     ) -> UploadFile:
@@ -84,16 +85,16 @@ class FileService:
         # generate file key
         file_uuid = str(uuid.uuid4())
 
-        current_tenant_id = extract_tenant_id(user)
+        resource_tenant_id = tenant_id if tenant_id is not None else extract_tenant_id(user)
 
-        file_key = "upload_files/" + (current_tenant_id or "") + "/" + file_uuid + "." + extension
+        file_key = "upload_files/" + (resource_tenant_id or "") + "/" + file_uuid + "." + extension
 
         # save file to storage
         storage.save(file_key, content)
 
         # save file to db
         upload_file = UploadFile(
-            tenant_id=current_tenant_id or "",
+            tenant_id=resource_tenant_id or "",
             storage_type=StorageType(dify_config.STORAGE_TYPE),
             key=file_key,
             name=filename,

api/services/rag_pipeline/rag_pipeline.py

@@ -586,6 +586,7 @@ class RagPipelineService:
 
         repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=db.engine,
+            tenant_id=pipeline.tenant_id,
             user=account,
             app_id=pipeline.id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -1377,6 +1378,7 @@ class RagPipelineService:
         # Create repository and save the node execution
         repository = SQLAlchemyWorkflowNodeExecutionRepository(
             session_factory=db.engine,
+            tenant_id=pipeline.tenant_id,
             user=current_user,
             app_id=pipeline.id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,

api/services/workflow_generator_service.py

@@ -16,13 +16,11 @@ from collections.abc import Iterator
 from typing import Any
 
 from core.app.app_config.entities import ModelConfig
-from core.llm_generator.llm_generator import LLMGenerator
 from core.model_manager import ModelInstance, ModelManager
 from core.workflow.generator import WorkflowGenerator
 from core.workflow.generator.tool_catalogue import build_tool_catalogue, format_tool_catalogue, installed_tool_keys
 from core.workflow.generator.types import (
     WorkflowGenerateResultDict,
-    WorkflowGenerationMode,
     WorkflowGenerationModeRequest,
 )
 from graphon.model_runtime.entities.model_entities import ModelType
@@ -52,11 +50,9 @@ class WorkflowGeneratorService:
         """
         Resolve a model instance for the tenant and run the generator.
 
-        ``mode`` accepts the ``"auto"`` sentinel — when set, the instruction is
-        classified into a concrete ``workflow`` / ``advanced-chat`` mode (one
-        tiny LLM call) before planning so the rest of the pipeline runs against
-        a concrete mode. The resolved mode is echoed back under the result's
-        ``mode`` key.
+        ``mode`` accepts the ``"auto"`` sentinel — the planner itself picks the
+        concrete ``workflow`` / ``advanced-chat`` mode (no extra LLM call) and
+        the resolution is echoed back under the result's ``mode`` key.
 
         ``current_graph`` is the existing draft graph for the cmd+k `/refine`
         flow — when present the generator refines it instead of creating a new
@@ -66,9 +62,6 @@ class WorkflowGeneratorService:
         controller can map them to existing HTTP error envelopes (same
         envelope as ``/rule-generate``).
         """
-        resolved_mode = cls._resolve_mode(
-            tenant_id=tenant_id, mode=mode, instruction=instruction, model_config=model_config
-        )
         model_instance, model_parameters, tool_catalogue_text, installed_tools = cls._resolve_generation_context(
             tenant_id=tenant_id, model_config=model_config
         )
@@ -79,7 +72,7 @@ class WorkflowGeneratorService:
             provider=model_config.provider,
             model_name=model_config.name,
             model_mode=model_config.mode.value,
-            mode=resolved_mode,
+            mode=mode,
             instruction=instruction,
             ideal_output=ideal_output,
             tool_catalogue_text=tool_catalogue_text,
@@ -101,16 +94,13 @@ class WorkflowGeneratorService:
         """
         Streaming sibling of ``generate_workflow_graph``.
 
-        Resolves the same model instance / tool catalogue / concrete mode, then
-        delegates to ``WorkflowGenerator.generate_workflow_graph_stream`` and
-        yields its ``(event_name, payload)`` tuples through to the controller's
-        SSE writer. Provider-init / invoke errors raised while resolving the
-        model instance propagate to the caller (the controller emits them as a
+        Resolves the same model instance / tool catalogue, then delegates to
+        ``WorkflowGenerator.generate_workflow_graph_stream`` and yields its
+        ``(event_name, payload)`` tuples through to the controller's SSE
+        writer. Provider-init / invoke errors raised while resolving the model
+        instance propagate to the caller (the controller emits them as a
         single ``result`` SSE event).
         """
-        resolved_mode = cls._resolve_mode(
-            tenant_id=tenant_id, mode=mode, instruction=instruction, model_config=model_config
-        )
         model_instance, model_parameters, tool_catalogue_text, installed_tools = cls._resolve_generation_context(
             tenant_id=tenant_id, model_config=model_config
         )
@@ -121,7 +111,7 @@ class WorkflowGeneratorService:
             provider=model_config.provider,
             model_name=model_config.name,
             model_mode=model_config.mode.value,
-            mode=resolved_mode,
+            mode=mode,
             instruction=instruction,
             ideal_output=ideal_output,
             tool_catalogue_text=tool_catalogue_text,
@@ -129,28 +119,6 @@ class WorkflowGeneratorService:
             current_graph=current_graph,
         )
 
-    @classmethod
-    def _resolve_mode(
-        cls,
-        *,
-        tenant_id: str,
-        mode: WorkflowGenerationModeRequest,
-        instruction: str,
-        model_config: ModelConfig,
-    ) -> WorkflowGenerationMode:
-        """Resolve the request mode into a concrete generation mode.
-
-        ``"auto"`` triggers a one-word LLM classification using the model the
-        user already picked; everything else passes through unchanged. The
-        classifier never raises (defaults to ``advanced-chat``), so ``auto``
-        never blocks generation.
-        """
-        if mode == "auto":
-            return LLMGenerator.classify_workflow_mode(
-                tenant_id=tenant_id, instruction=instruction, model_config=model_config
-            )
-        return mode
-
     @classmethod
     def _resolve_generation_context(
         cls,

api/services/workflow_service.py

@@ -1039,6 +1039,7 @@ class WorkflowService:
         # Create repository and save the node execution
         repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
             session_factory=db.engine,
+            tenant_id=app_model.tenant_id,
             user=account,
             app_id=app_model.id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,

api/services/workspace_service.py

@@ -9,6 +9,15 @@ from services.account_service import TenantService
 from services.feature_service import FeatureService
 
 
+def _set_credit_pool_info(
+    tenant_info: dict[str, object], *, quota_limit: int, quota_used: int, exhausted_at: int | None = None
+) -> None:
+    tenant_info["trial_credits"] = quota_limit
+    tenant_info["trial_credits_used"] = quota_used
+    if isinstance(exhausted_at, int) and exhausted_at > 0 and quota_limit > 0 and quota_used >= quota_limit:
+        tenant_info["trial_credits_exhausted_at"] = exhausted_at
+
+
 class WorkspaceService:
     @classmethod
     def get_tenant_info(cls, tenant: Tenant, session: Session):
@@ -54,7 +63,7 @@ class WorkspaceService:
         if dify_config.EDITION == "CLOUD":
             tenant_info["next_credit_reset_date"] = feature.next_credit_reset_date
 
-            from services.credit_pool_service import CreditPoolService
+            from services.credit_pool_service import CreditPoolBalance, CreditPoolService
 
             paid_pool = CreditPoolService.get_pool(tenant_id=tenant.id, pool_type="paid", session=session)
             # if the tenant is not on the sandbox plan and the paid pool is not full, use the paid pool
@@ -63,12 +72,22 @@ class WorkspaceService:
                 and paid_pool is not None
                 and (paid_pool.quota_limit == -1 or paid_pool.quota_limit > paid_pool.quota_used)
             ):
-                tenant_info["trial_credits"] = paid_pool.quota_limit
-                tenant_info["trial_credits_used"] = paid_pool.quota_used
+                exhausted_at = paid_pool.exhausted_at if isinstance(paid_pool, CreditPoolBalance) else None
+                _set_credit_pool_info(
+                    tenant_info,
+                    quota_limit=paid_pool.quota_limit,
+                    quota_used=paid_pool.quota_used,
+                    exhausted_at=exhausted_at,
+                )
             else:
                 trial_pool = CreditPoolService.get_pool(tenant_id=tenant.id, pool_type="trial", session=session)
                 if trial_pool:
-                    tenant_info["trial_credits"] = trial_pool.quota_limit
-                    tenant_info["trial_credits_used"] = trial_pool.quota_used
+                    exhausted_at = trial_pool.exhausted_at if isinstance(trial_pool, CreditPoolBalance) else None
+                    _set_credit_pool_info(
+                        tenant_info,
+                        quota_limit=trial_pool.quota_limit,
+                        quota_used=trial_pool.quota_used,
+                        exhausted_at=exhausted_at,
+                    )
 
         return tenant_info

api/tasks/app_generate/workflow_execute_task.py

@@ -248,7 +248,6 @@ class _AppRunner:
             case _Account():
                 with self._session() as session:
                     user: Account = session.get(Account, user_params.user_id)
-                    user.set_tenant_id_with_session(self._exec_params.tenant_id, session=session)
                 return user
             case _:
                 raise AssertionError(f"user should only be _Account or _EndUser, got {type(user_params)}")
@@ -257,10 +256,7 @@ class _AppRunner:
 def _resolve_user_for_run(session: Session, workflow_run: WorkflowRun) -> Account | EndUser | None:
     role = CreatorUserRole(workflow_run.created_by_role)
     if role == CreatorUserRole.ACCOUNT:
-        user = session.get(Account, workflow_run.created_by)
-        if user:
-            user.set_tenant_id_with_session(workflow_run.tenant_id, session=session)
-        return user
+        return session.get(Account, workflow_run.created_by)
 
     return session.get(EndUser, workflow_run.created_by)
 
@@ -617,12 +613,14 @@ def _resume_advanced_chat(
 
     workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=app_model.id,
         triggered_from=triggered_from,
     )
     workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=app_model.id,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -684,12 +682,14 @@ def _resume_workflow(
 
     workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=app_model.id,
         triggered_from=triggered_from,
     )
     workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=app_model.id,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tasks/async_workflow_tasks.py

@@ -247,12 +247,14 @@ def resume_workflow_execution(task_data_dict: dict[str, Any]) -> None:
 
     workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=generate_entity.app_config.app_id,
         triggered_from=WorkflowRunTriggeredFrom(workflow_run.triggered_from),
     )
     workflow_node_execution_repository = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
         session_factory=session_factory,
+        tenant_id=app_model.tenant_id,
         user=user,
         app_id=generate_entity.app_config.app_id,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tasks/install_default_plugins_task.py

@@ -0,0 +1,99 @@
+"""Install configured marketplace plugins for a newly created tenant."""
+
+import logging
+
+from celery import shared_task
+
+from configs import dify_config
+from core.helper import marketplace
+from core.plugin.entities.plugin_daemon import PluginInstallTaskStatus
+from core.plugin.plugin_service import PluginService
+from services.model_provider_service import ModelProviderService
+
+logger = logging.getLogger(__name__)
+
+
+@shared_task(queue="plugin", bind=True, max_retries=60, default_retry_delay=5)
+def configure_default_models_task(self, tenant_id: str, plugin_install_task_id: str | None) -> None:
+    """Set explicitly configured default models after default plugins finish installing."""
+    if not dify_config.NEW_USER_DEFAULT_MODELS:
+        return
+
+    plugin_install_failed = False
+    if plugin_install_task_id:
+        try:
+            install_task = PluginService.fetch_install_task(tenant_id, plugin_install_task_id)
+        except Exception as exc:
+            logger.warning(
+                "Failed to fetch default plugin installation task for tenant %s; retrying",
+                tenant_id,
+            )
+            raise self.retry(exc=exc)
+
+        if install_task.status in (PluginInstallTaskStatus.Pending, PluginInstallTaskStatus.Running):
+            raise self.retry()
+
+        plugin_install_failed = install_task.status == PluginInstallTaskStatus.Failed
+        if plugin_install_failed:
+            failed_plugin_ids = [
+                plugin.plugin_id for plugin in install_task.plugins if plugin.status == PluginInstallTaskStatus.Failed
+            ]
+            logger.error(
+                "Default plugin installation failed for tenant %s: %s",
+                tenant_id,
+                ", ".join(failed_plugin_ids),
+            )
+
+    model_provider_service = ModelProviderService()
+    failed_model_types: list[str] = []
+    for model_type, provider, model in dify_config.NEW_USER_DEFAULT_MODEL_LIST:
+        try:
+            model_provider_service.update_default_model_of_model_type(
+                tenant_id=tenant_id,
+                model_type=model_type,
+                provider=provider,
+                model=model,
+            )
+        except Exception:
+            failed_model_types.append(model_type)
+            logger.exception(
+                "Failed to configure default model for tenant %s: model_type=%s provider=%s model=%s",
+                tenant_id,
+                model_type,
+                provider,
+                model,
+            )
+
+    if plugin_install_failed or failed_model_types:
+        raise RuntimeError(
+            f"Failed to initialize defaults for tenant {tenant_id}; "
+            f"model types: {', '.join(failed_model_types) or 'none'}"
+        )
+
+
+@shared_task(queue="plugin")
+def install_default_plugins_task(tenant_id: str, plugin_ids: list[str]) -> None:
+    """Install the latest marketplace versions of the configured plugins."""
+    if not plugin_ids:
+        return
+
+    try:
+        manifests = {manifest.plugin_id: manifest for manifest in marketplace.batch_fetch_plugin_manifests(plugin_ids)}
+        plugin_identifiers = [
+            manifests[plugin_id].latest_package_identifier for plugin_id in plugin_ids if plugin_id in manifests
+        ]
+        missing_plugin_ids = [plugin_id for plugin_id in plugin_ids if plugin_id not in manifests]
+        if missing_plugin_ids:
+            logger.warning("Default plugins not found in marketplace: %s", ", ".join(missing_plugin_ids))
+        if not plugin_identifiers:
+            return
+
+        response = PluginService.install_from_marketplace_pkg(tenant_id, plugin_identifiers)
+        if dify_config.NEW_USER_DEFAULT_MODELS:
+            configure_default_models_task.delay(
+                tenant_id,
+                None if response.all_installed else response.task_id,
+            )
+    except Exception:
+        logger.exception("Failed to install default plugins for tenant %s", tenant_id)
+        raise

api/tasks/rag_pipeline/priority_rag_pipeline_run_task.py

@@ -146,6 +146,7 @@ def run_single_rag_pipeline_task(rag_pipeline_invoke_entity: Mapping[str, Any],
                 session_factory = sessionmaker(bind=db.engine, expire_on_commit=False)
                 workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                     session_factory=session_factory,
+                    tenant_id=pipeline.tenant_id,
                     user=account,
                     app_id=entity.app_config.app_id,
                     triggered_from=WorkflowRunTriggeredFrom.RAG_PIPELINE_RUN,
@@ -154,6 +155,7 @@ def run_single_rag_pipeline_task(rag_pipeline_invoke_entity: Mapping[str, Any],
                 workflow_node_execution_repository = (
                     DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                         session_factory=session_factory,
+                        tenant_id=pipeline.tenant_id,
                         user=account,
                         app_id=entity.app_config.app_id,
                         triggered_from=WorkflowNodeExecutionTriggeredFrom.RAG_PIPELINE_RUN,

api/tasks/rag_pipeline/rag_pipeline_run_task.py

@@ -160,6 +160,7 @@ def run_single_rag_pipeline_task(rag_pipeline_invoke_entity: Mapping[str, Any],
                 session_factory = sessionmaker(bind=db.engine, expire_on_commit=False)
                 workflow_execution_repository = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                     session_factory=session_factory,
+                    tenant_id=pipeline.tenant_id,
                     user=account,
                     app_id=entity.app_config.app_id,
                     triggered_from=WorkflowRunTriggeredFrom.RAG_PIPELINE_RUN,
@@ -168,6 +169,7 @@ def run_single_rag_pipeline_task(rag_pipeline_invoke_entity: Mapping[str, Any],
                 workflow_node_execution_repository = (
                     DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                         session_factory=session_factory,
+                        tenant_id=pipeline.tenant_id,
                         user=account,
                         app_id=entity.app_config.app_id,
                         triggered_from=WorkflowNodeExecutionTriggeredFrom.RAG_PIPELINE_RUN,

api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth.py

@@ -656,10 +656,8 @@ class TestAccountGeneration:
     @patch("controllers.console.auth.oauth.TenantService")
     @patch("controllers.console.auth.oauth.FeatureService")
     @patch("controllers.console.auth.oauth.AccountService")
-    @patch("controllers.console.auth.oauth.tenant_was_created")
     def test_should_create_workspace_for_account_without_tenant(
         self,
-        mock_event: MagicMock,
         mock_account_service: MagicMock,
         mock_feature_service: MagicMock,
         mock_tenant_service: MagicMock,
@@ -672,16 +670,9 @@ class TestAccountGeneration:
         mock_tenant_service.get_join_tenants.return_value = []
         mock_feature_service.get_system_features.return_value.is_allow_create_workspace = True
 
-        mock_new_tenant = MagicMock()
-        mock_tenant_service.create_tenant.return_value = mock_new_tenant
-
         with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
             result, oauth_new_user = _generate_account("github", user_info)
 
             assert result == mock_account
             assert oauth_new_user is False
-            mock_tenant_service.create_tenant.assert_called_once_with("Test User's Workspace", session=ANY)
-            mock_tenant_service.create_tenant_member.assert_called_once_with(
-                mock_new_tenant, mock_account, ANY, role="owner"
-            )
-            mock_event.send.assert_called_once_with(mock_new_tenant)
+            mock_tenant_service.create_owner_tenant.assert_called_once_with(mock_account, session=ANY)

api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py

@@ -267,12 +267,14 @@ class TestHumanInputResumeNodeExecutionIntegration:
         )
         execution_repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=self.session.get_bind(),
+            tenant_id=self.tenant.id,
             user=self.account,
             app_id=self.app.id,
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
         )
         node_execution_repo = SQLAlchemyWorkflowNodeExecutionRepository(
             session_factory=self.session.get_bind(),
+            tenant_id=self.tenant.id,
             user=self.account,
             app_id=self.app.id,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_workflow_node_execution_repository.py

@@ -40,8 +40,11 @@ def _create_account_with_tenant(session: Session) -> Account:
 def _make_repo(session: Session, account: Account, app_id: str) -> SQLAlchemyWorkflowNodeExecutionRepository:
     engine = session.get_bind()
     assert isinstance(engine, Engine)
+    tenant_id = account.current_tenant_id
+    assert tenant_id is not None
     return SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=sessionmaker(bind=engine, expire_on_commit=False),
+        tenant_id=tenant_id,
         user=account,
         app_id=app_id,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/test_containers_integration_tests/services/test_app_dsl_service.py

@@ -11,7 +11,7 @@ import pytest
 import yaml
 from faker import Faker
 from flask import Flask
-from sqlalchemy import select
+from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
 from core.trigger.constants import (
@@ -22,11 +22,24 @@ from core.trigger.constants import (
 from extensions.ext_redis import redis_client
 from graphon.enums import BuiltinNodeTypes
 from models import Account, App, AppMode
-from models.agent import Agent, AgentConfigDraft, AgentConfigDraftType, AgentConfigSnapshot, AgentScope, AgentSource
+from models.agent import (
+    Agent,
+    AgentConfigDraft,
+    AgentConfigDraftType,
+    AgentConfigSnapshot,
+    AgentScope,
+    AgentSource,
+    AgentStatus,
+    WorkflowAgentBindingType,
+    WorkflowAgentNodeBinding,
+)
 from models.agent_config_entities import AgentSoulConfig
 from models.model import AppModelConfig, IconType
+from models.workflow import Workflow, WorkflowType
 from services import app_dsl_service
 from services.account_service import AccountService, TenantService
+from services.agent.dsl_entities import AGENT_PACKAGE_REF_KEY, make_portable_agent_package
+from services.agent.dsl_service import AgentDslService
 from services.app_dsl_service import (
     CHECK_DEPENDENCIES_REDIS_KEY_PREFIX,
     CURRENT_DSL_VERSION,
@@ -952,6 +965,126 @@ class TestAppDslService:
         assert "model_config" in exported_data
         assert "dependencies" in exported_data
 
+    def test_workflow_package_import_materializes_all_agent_bindings_as_inline(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
+        app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
+        app.mode = AppMode.WORKFLOW
+        workflow = Workflow.new(
+            tenant_id=app.tenant_id,
+            app_id=app.id,
+            type=WorkflowType.WORKFLOW.value,
+            version=Workflow.VERSION_DRAFT,
+            graph=json.dumps({"nodes": [], "edges": []}),
+            features=json.dumps({}),
+            created_by=account.id,
+            environment_variables=[],
+            conversation_variables=[],
+            rag_pipeline_variables=[],
+        )
+        db_session_with_containers.add(workflow)
+        db_session_with_containers.flush()
+
+        source_agent = Agent(
+            tenant_id=app.tenant_id,
+            name="Portable Agent",
+            description="Imported into each node",
+            role="researcher",
+            scope=AgentScope.ROSTER,
+            source=AgentSource.AGENT_APP,
+            status=AgentStatus.ACTIVE,
+            created_by=account.id,
+            updated_by=account.id,
+        )
+        package = make_portable_agent_package(source_agent, AgentSoulConfig(config_note="portable"))
+        graph = {
+            "nodes": [
+                {
+                    "id": "roster-node",
+                    "data": {
+                        "type": BuiltinNodeTypes.AGENT,
+                        "version": "2",
+                        "agent_binding": {
+                            "binding_type": WorkflowAgentBindingType.ROSTER_AGENT.value,
+                            AGENT_PACKAGE_REF_KEY: "agent_1",
+                        },
+                    },
+                },
+                {
+                    "id": "inline-node",
+                    "data": {
+                        "type": BuiltinNodeTypes.AGENT,
+                        "version": "2",
+                        "agent_binding": {
+                            "binding_type": WorkflowAgentBindingType.INLINE_AGENT.value,
+                            AGENT_PACKAGE_REF_KEY: "agent_1",
+                        },
+                    },
+                },
+            ],
+            "edges": [],
+        }
+        imported_roster_count_before = db_session_with_containers.scalar(
+            select(func.count())
+            .select_from(Agent)
+            .where(
+                Agent.tenant_id == app.tenant_id,
+                Agent.scope == AgentScope.ROSTER,
+                Agent.source == AgentSource.IMPORTED,
+            )
+        )
+
+        imported_graph, warnings = AgentDslService(db_session_with_containers).import_workflow_packages(
+            workflow=workflow,
+            portable_graph=graph,
+            raw_packages={"agent_1": package.model_dump(mode="json")},
+            account=account,
+        )
+        db_session_with_containers.commit()
+
+        assert warnings == []
+        graph_bindings = [node["data"]["agent_binding"] for node in imported_graph["nodes"]]
+        assert all(binding["binding_type"] == WorkflowAgentBindingType.INLINE_AGENT.value for binding in graph_bindings)
+        assert len({binding["agent_id"] for binding in graph_bindings}) == 2
+
+        bindings = db_session_with_containers.scalars(
+            select(WorkflowAgentNodeBinding).where(
+                WorkflowAgentNodeBinding.tenant_id == app.tenant_id,
+                WorkflowAgentNodeBinding.workflow_id == workflow.id,
+                WorkflowAgentNodeBinding.workflow_version == Workflow.VERSION_DRAFT,
+            )
+        ).all()
+        assert len(bindings) == 2
+        assert all(binding.binding_type == WorkflowAgentBindingType.INLINE_AGENT for binding in bindings)
+
+        imported_agents = db_session_with_containers.scalars(
+            select(Agent).where(Agent.id.in_({binding.agent_id for binding in bindings if binding.agent_id}))
+        ).all()
+        assert len(imported_agents) == 2
+        assert all(agent.scope == AgentScope.WORKFLOW_ONLY for agent in imported_agents)
+        assert all(agent.source == AgentSource.IMPORTED for agent in imported_agents)
+        assert all(agent.app_id == app.id and agent.workflow_id == workflow.id for agent in imported_agents)
+        assert {agent.workflow_node_id for agent in imported_agents} == {"roster-node", "inline-node"}
+        assert all(agent.backing_app_id for agent in imported_agents)
+
+        backing_apps = db_session_with_containers.scalars(
+            select(App).where(App.id.in_({agent.backing_app_id for agent in imported_agents if agent.backing_app_id}))
+        ).all()
+        assert len(backing_apps) == 2
+        assert all(backing_app.mode == AppMode.AGENT for backing_app in backing_apps)
+        assert all(backing_app.enable_site is False and backing_app.enable_api is False for backing_app in backing_apps)
+
+        imported_roster_count_after = db_session_with_containers.scalar(
+            select(func.count())
+            .select_from(Agent)
+            .where(
+                Agent.tenant_id == app.tenant_id,
+                Agent.scope == AgentScope.ROSTER,
+                Agent.source == AgentSource.IMPORTED,
+            )
+        )
+        assert imported_roster_count_after == imported_roster_count_before
+
     def test_agent_app_dsl_round_trip_creates_unpublished_imported_agent(
         self, db_session_with_containers: Session, mock_external_service_dependencies
     ):

api/tests/test_containers_integration_tests/services/test_workspace_service.py

@@ -7,6 +7,7 @@ from faker import Faker
 from sqlalchemy.orm import Session
 
 from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from services.credit_pool_service import CreditPoolBalance
 from services.workspace_service import WorkspaceService
 
 
@@ -720,7 +721,13 @@ class TestWorkspaceService:
         mock_external_service_dependencies["tenant_service"].has_roles.return_value = False
 
         paid_pool = MagicMock(quota_limit=500, quota_used=500)
-        trial_pool = MagicMock(quota_limit=100, quota_used=10)
+        trial_pool = CreditPoolBalance(
+            tenant_id=tenant.id,
+            pool_type="trial",
+            quota_limit=100,
+            quota_used=100,
+            exhausted_at=1748908800,
+        )
 
         with (
             patch("services.workspace_service.current_user", account),
@@ -730,7 +737,8 @@ class TestWorkspaceService:
 
         assert result is not None
         assert result["trial_credits"] == 100
-        assert result["trial_credits_used"] == 10
+        assert result["trial_credits_used"] == 100
+        assert result["trial_credits_exhausted_at"] == 1748908800
 
     def test_get_tenant_info_cloud_fall_back_to_trial_when_paid_none(
         self, db_session_with_containers: Session, mock_external_service_dependencies

api/tests/unit_tests/configs/test_dify_config.py

@@ -89,6 +89,54 @@ def test_dify_config(monkeypatch: pytest.MonkeyPatch):
     assert Version(config.project.version) >= Version("1.0.0")
 
 
+def test_new_user_default_plugin_ids_are_parsed_from_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    _set_basic_config_env(monkeypatch)
+    monkeypatch.setenv(
+        "NEW_USER_DEFAULT_PLUGIN_IDS",
+        "langgenius/openai, langgenius/gemini",
+    )
+
+    config = DifyConfig(_env_file=None)
+
+    assert config.NEW_USER_DEFAULT_PLUGIN_ID_LIST == [
+        "langgenius/openai",
+        "langgenius/gemini",
+    ]
+
+
+def test_new_user_default_models_are_parsed_from_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    _set_basic_config_env(monkeypatch)
+    monkeypatch.setenv(
+        "NEW_USER_DEFAULT_MODELS",
+        (
+            "llm:langgenius/openai/openai:gpt-4o-mini, "
+            "text-embedding:langgenius/openai/openai:text-embedding-3-small, "
+            "rerank:langgenius/ollama/ollama:reranker:latest"
+        ),
+    )
+
+    config = DifyConfig(_env_file=None)
+
+    assert config.NEW_USER_DEFAULT_MODEL_LIST == [
+        ("llm", "langgenius/openai/openai", "gpt-4o-mini"),
+        ("text-embedding", "langgenius/openai/openai", "text-embedding-3-small"),
+        ("rerank", "langgenius/ollama/ollama", "reranker:latest"),
+    ]
+
+
+def test_new_user_default_models_reject_duplicate_model_types(monkeypatch: pytest.MonkeyPatch) -> None:
+    _set_basic_config_env(monkeypatch)
+    monkeypatch.setenv(
+        "NEW_USER_DEFAULT_MODELS",
+        "llm:langgenius/openai/openai:gpt-4o-mini,llm:langgenius/anthropic/anthropic:claude-sonnet-4",
+    )
+
+    config = DifyConfig(_env_file=None)
+
+    with pytest.raises(ValueError, match="duplicate model type: llm"):
+        _ = config.NEW_USER_DEFAULT_MODEL_LIST
+
+
 def test_http_timeout_defaults(monkeypatch: pytest.MonkeyPatch):
     """Test that HTTP timeout defaults are correctly set"""
     # clear system environment variables

api/tests/unit_tests/controllers/console/explore/test_trial.py

@@ -33,6 +33,7 @@ from core.errors.error import (
     QuotaExceededError,
 )
 from graphon.model_runtime.errors.invoke import InvokeError
+from graphon.variables import StringVariable
 from models import Account
 from models.account import TenantStatus
 from models.model import AppMode
@@ -1146,7 +1147,14 @@ class TestAppWorkflowApi:
             created_at=datetime(2024, 1, 1, tzinfo=UTC),
             updated_at=datetime(2024, 1, 2, tzinfo=UTC),
             environment_variables=[],
-            conversation_variables=[],
+            conversation_variables=[
+                StringVariable(
+                    id="conversation-variable-1",
+                    name="topic",
+                    value="sqlite",
+                    selector=["conversation", "topic"],
+                )
+            ],
             rag_pipeline_variables=[],
             get_created_by_account=MagicMock(return_value=created_by),
             get_updated_by_account=MagicMock(return_value=None),
@@ -1174,7 +1182,15 @@ class TestAppWorkflowApi:
             "updated_at": 1704153600,
             "tool_published": True,
             "environment_variables": [],
-            "conversation_variables": [],
+            "conversation_variables": [
+                {
+                    "id": "conversation-variable-1",
+                    "name": "topic",
+                    "value_type": "string",
+                    "value": "sqlite",
+                    "description": "",
+                }
+            ],
             "rag_pipeline_variables": [],
         }
         app_model.workflow_with_session.assert_called_once_with(session=session)

api/tests/unit_tests/controllers/console/workspace/test_tool_providers.py

@@ -6,18 +6,22 @@ import builtins
 import importlib
 from contextlib import ExitStack, contextmanager
 from inspect import unwrap
-from types import ModuleType, SimpleNamespace
-from unittest.mock import ANY, MagicMock, patch
+from types import ModuleType
+from unittest.mock import MagicMock, patch
+from uuid import NAMESPACE_URL, uuid5
 
 import pytest
 from flask import Flask
 from flask.views import MethodView
+from sqlalchemy.orm import Session, scoped_session, sessionmaker
 
 from core.tools.entities.api_entities import ToolProviderApiEntity as CoreToolProviderApiEntity
 from core.tools.entities.common_entities import I18nObject
 from core.tools.entities.tool_entities import ToolParameter
-from models import Account
+from models import Account, BuiltinToolProvider, Tenant, TenantAccountJoin
 from models.account import TenantAccountRole
+from models.credential_permission import CredentialPermission
+from models.enums import PermissionEnum
 
 if not hasattr(builtins, "MethodView"):
     builtins.MethodView = MethodView  # type: ignore[attr-defined]
@@ -27,13 +31,6 @@ _CONTROLLER_MODULE: ModuleType | None = None
 _WRAPS_MODULE: ModuleType | None = None
 
 
-@contextmanager
-def _mock_db():
-    mock_session = SimpleNamespace(scalar=lambda *args, **kwargs: True)
-    with patch("extensions.ext_database.db.session", mock_session):
-        yield
-
-
 @pytest.fixture
 def app() -> Flask:
     flask_app = Flask(__name__)
@@ -69,8 +66,7 @@ def controller_module(monkeypatch: pytest.MonkeyPatch):
         with ExitStack() as stack:
             for target, value in patch_targets:
                 stack.enter_context(patch(target, value))
-            with _mock_db():
-                _CONTROLLER_MODULE = importlib.import_module(module_name)
+            _CONTROLLER_MODULE = importlib.import_module(module_name)
 
     module = _CONTROLLER_MODULE
 
@@ -88,11 +84,79 @@ def controller_module(monkeypatch: pytest.MonkeyPatch):
 
 def _mock_account(user_id: str = "user-123") -> Account:
     user = Account(name="Test User", email=f"{user_id}@example.com")
-    user.id = user_id
+    user.id = _stable_uuid(f"account:{user_id}")
     user.role = TenantAccountRole.NORMAL
     return user
 
 
+def _stable_uuid(value: str) -> str:
+    return str(uuid5(NAMESPACE_URL, value))
+
+
+def _persist_workspace(session: Session, user: Account, tenant_name: str) -> Tenant:
+    tenant = Tenant(name=tenant_name)
+    tenant.id = _stable_uuid(f"tenant:{tenant_name}")
+    membership = TenantAccountJoin(
+        tenant_id=tenant.id,
+        account_id=user.id,
+        current=True,
+        role=TenantAccountRole.NORMAL,
+    )
+    session.add_all([user, tenant, membership])
+    session.commit()
+    return tenant
+
+
+def _provider_credential(
+    *,
+    tenant_id: str,
+    user_id: str,
+    credential_name: str,
+    visibility: PermissionEnum = PermissionEnum.ALL_TEAM,
+) -> BuiltinToolProvider:
+    provider = BuiltinToolProvider(
+        name=credential_name,
+        tenant_id=tenant_id,
+        user_id=user_id,
+        provider="demo",
+        encrypted_credentials='{"api_key": "sk-secret"}',
+        visibility=visibility,
+    )
+    provider.id = _stable_uuid(f"credential:{tenant_id}:{credential_name}")
+    return provider
+
+
+@contextmanager
+def _bind_database_session(session: Session):
+    database_session = scoped_session(
+        sessionmaker(bind=session.get_bind(), expire_on_commit=False),
+    )
+    try:
+        with patch("extensions.ext_database.db.session", database_session):
+            yield
+    finally:
+        database_session.remove()
+
+
+@contextmanager
+def _mock_credential_encryption(controller_module: ModuleType):
+    encrypter = MagicMock()
+    encrypter.decrypt.side_effect = lambda credentials: credentials
+    encrypter.mask_plugin_credentials.return_value = {"api_key": "[__HIDDEN__]"}
+    with (
+        patch(
+            "services.tools.builtin_tools_manage_service.ToolManager.get_builtin_provider",
+            return_value=MagicMock(),
+        ),
+        patch.object(
+            controller_module.BuiltinToolManageService,
+            "create_tool_encrypter",
+            return_value=(encrypter, MagicMock()),
+        ),
+    ):
+        yield
+
+
 def _set_current_account(
     monkeypatch: pytest.MonkeyPatch,
     controller_module: ModuleType,
@@ -190,23 +254,6 @@ def _provider_list_item(
     return service_payload, provider.model_dump(mode="json", exclude_unset=True)
 
 
-def _credential_response(controller_module: ModuleType, credential_id: str = "cred-1") -> tuple[dict, dict]:
-    expected = {
-        "id": credential_id,
-        "name": "Credential",
-        "provider": "demo",
-        "credential_type": controller_module.CredentialType.API_KEY,
-        "is_default": False,
-        "credentials": {},
-        "visibility": "all_team_members",
-        "created_by": "",
-        "partial_member_list": [],
-        "from_other_member": False,
-    }
-    credential = controller_module.ToolProviderCredentialApiEntity.model_validate(expected)
-    return credential.model_dump(mode="json"), credential.model_dump(mode="json")
-
-
 def _provider_config_response(controller_module: ModuleType) -> tuple[dict, dict]:
     expected = {
         "type": "secret-input",
@@ -308,7 +355,7 @@ def test_builtin_provider_add_passes_payload(
 
     assert response == {"result": "success"}
     service_mock.assert_called_once_with(
-        user_id="user-123",
+        user_id=user.id,
         tenant_id="tenant-456",
         provider="openai",
         credentials={"api_key": "sk-test"},
@@ -397,54 +444,96 @@ def test_builtin_provider_info_uses_core_to_dict_tool_projection(
     assert "original_credentials" not in resp
 
 
-def test_builtin_provider_credentials_get(app: Flask, controller_module, monkeypatch: pytest.MonkeyPatch):
-    user = _mock_account("user-tenant-cred")
-    _set_current_account(monkeypatch, controller_module, user, "tenant-cred")
-    service_payload, expected_response = _credential_response(controller_module)
-    service_mock = MagicMock(return_value=[service_payload])
-    monkeypatch.setattr(
-        controller_module.BuiltinToolManageService,
-        "get_builtin_tool_provider_credentials",
-        service_mock,
-    )
-
-    with app.test_request_context("/creds", method="GET"):
-        resp = controller_module.ToolBuiltinProviderGetCredentialsApi().get(provider="demo")
-
-    assert resp == [expected_response]
-    service_mock.assert_called_once_with(
-        tenant_id="tenant-cred",
-        provider_name="demo",
-        session=ANY,
-        user=user,
-        include_credential_ids=None,
-    )
-
-
-def test_builtin_provider_credentials_get_reads_repeated_include_ids(
-    app: Flask, controller_module, monkeypatch: pytest.MonkeyPatch
+@pytest.mark.parametrize(
+    "sqlite_session",
+    [(Account, Tenant, TenantAccountJoin, BuiltinToolProvider, CredentialPermission)],
+    indirect=True,
+)
+def test_builtin_provider_credentials_get(
+    app: Flask,
+    controller_module: ModuleType,
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session: Session,
 ):
     user = _mock_account("user-tenant-cred")
-    credential_payload, expected = _credential_response(controller_module)
-    service_mock = MagicMock(return_value=[credential_payload])
-    monkeypatch.setattr(
-        controller_module.BuiltinToolManageService,
-        "get_builtin_tool_provider_credentials",
-        service_mock,
+    tenant = _persist_workspace(sqlite_session, user, "tenant-cred")
+    credential = _provider_credential(
+        tenant_id=tenant.id,
+        user_id=user.id,
+        credential_name="Credential",
     )
+    other_tenant = Tenant(name="other-tenant")
+    other_tenant.id = _stable_uuid("tenant:other-tenant")
+    other_credential = _provider_credential(
+        tenant_id=other_tenant.id,
+        user_id=user.id,
+        credential_name="Other Tenant Credential",
+    )
+    sqlite_session.add_all([credential, other_tenant, other_credential])
+    sqlite_session.commit()
+    _set_current_account(monkeypatch, controller_module, user, tenant.id)
 
-    with app.test_request_context("/creds?include_credential_ids=cred-1&include_credential_ids=cred-2", method="GET"):
+    with (
+        _bind_database_session(sqlite_session),
+        _mock_credential_encryption(controller_module),
+        app.test_request_context("/creds", method="GET"),
+    ):
+        response = controller_module.ToolBuiltinProviderGetCredentialsApi().get(provider="demo")
+
+    assert [item["id"] for item in response] == [credential.id]
+    assert response[0]["name"] == "Credential"
+    assert response[0]["credentials"] == {"api_key": "[__HIDDEN__]"}
+    assert response[0]["created_by"] == user.id
+    assert other_credential.id not in {item["id"] for item in response}
+
+
+@pytest.mark.parametrize(
+    "sqlite_session",
+    [(Account, Tenant, TenantAccountJoin, BuiltinToolProvider, CredentialPermission)],
+    indirect=True,
+)
+def test_builtin_provider_credentials_get_reads_repeated_include_ids(
+    app: Flask,
+    controller_module: ModuleType,
+    monkeypatch: pytest.MonkeyPatch,
+    sqlite_session: Session,
+):
+    user = _mock_account("user-tenant-cred")
+    tenant = _persist_workspace(sqlite_session, user, "tenant-cred")
+    visible_credential = _provider_credential(
+        tenant_id=tenant.id,
+        user_id=user.id,
+        credential_name="Visible Credential",
+    )
+    other_user = _mock_account("other-user")
+    borrowed_credential = _provider_credential(
+        tenant_id=tenant.id,
+        user_id=other_user.id,
+        credential_name="Borrowed Credential",
+        visibility=PermissionEnum.ONLY_ME,
+    )
+    other_membership = TenantAccountJoin(
+        tenant_id=tenant.id,
+        account_id=other_user.id,
+        role=TenantAccountRole.NORMAL,
+    )
+    sqlite_session.add_all([visible_credential, other_user, other_membership, borrowed_credential])
+    sqlite_session.commit()
+
+    request_path = (
+        f"/creds?include_credential_ids={visible_credential.id}&include_credential_ids={borrowed_credential.id}"
+    )
+    with (
+        _bind_database_session(sqlite_session),
+        _mock_credential_encryption(controller_module),
+        app.test_request_context(request_path, method="GET"),
+    ):
         api = controller_module.ToolBuiltinProviderGetCredentialsApi()
-        resp = unwrap(api.get)(api, "tenant-cred", user, provider="demo")
+        response = unwrap(api.get)(api, tenant.id, user, provider="demo")
 
-    assert resp == [expected]
-    service_mock.assert_called_once_with(
-        tenant_id="tenant-cred",
-        provider_name="demo",
-        session=ANY,
-        user=user,
-        include_credential_ids=["cred-1", "cred-2"],
-    )
+    assert [item["id"] for item in response] == [visible_credential.id, borrowed_credential.id]
+    assert response[0]["from_other_member"] is False
+    assert response[1]["from_other_member"] is True
 
 
 def test_api_provider_remote_schema_get(app: Flask, controller_module, monkeypatch: pytest.MonkeyPatch):

api/tests/unit_tests/controllers/inner_api/workspace/test_workspace.py

@@ -84,10 +84,9 @@ class TestEnterpriseWorkspace:
         assert hasattr(api_instance, "post")
         assert callable(api_instance.post)
 
-    @patch("controllers.inner_api.workspace.workspace.tenant_was_created")
     @patch("controllers.inner_api.workspace.workspace.TenantService")
     @patch("controllers.inner_api.workspace.workspace.db")
-    def test_post_creates_workspace_with_owner(self, mock_db, mock_tenant_svc, mock_event, api_instance, app: Flask):
+    def test_post_creates_workspace_with_owner(self, mock_db, mock_tenant_svc, api_instance, app: Flask):
         """Test that post() creates a workspace and assigns the owner account"""
         # Arrange
         mock_account = MagicMock()
@@ -102,7 +101,7 @@ class TestEnterpriseWorkspace:
         mock_tenant.status = TenantStatus.NORMAL
         mock_tenant.created_at = now
         mock_tenant.updated_at = now
-        mock_tenant_svc.create_tenant.return_value = mock_tenant
+        mock_tenant_svc.create_owner_tenant.return_value = mock_tenant
 
         # Act — unwrap to bypass auth/setup decorators (tested in test_auth_wraps.py)
         unwrapped_post = inspect.unwrap(api_instance.post)
@@ -115,11 +114,12 @@ class TestEnterpriseWorkspace:
         assert result["message"] == "enterprise workspace created."
         assert result["tenant"]["id"] == "tenant-id"
         assert result["tenant"]["name"] == "My Workspace"
-        mock_tenant_svc.create_tenant.assert_called_once_with("My Workspace", is_from_dashboard=True, session=ANY)
-        mock_tenant_svc.create_tenant_member.assert_called_once_with(
-            mock_tenant, mock_account, mock_db.session(), role="owner"
+        mock_tenant_svc.create_owner_tenant.assert_called_once_with(
+            mock_account,
+            name="My Workspace",
+            is_from_dashboard=True,
+            session=ANY,
         )
-        mock_event.send.assert_called_once_with(mock_tenant)
 
     @patch("controllers.inner_api.workspace.workspace.db")
     def test_post_returns_404_when_owner_not_found(self, mock_db, api_instance, app: Flask):

api/tests/unit_tests/controllers/web/test_human_input_form.py

@@ -4,11 +4,13 @@ from __future__ import annotations
 
 from datetime import UTC, datetime
 from types import SimpleNamespace
-from typing import Any
 from unittest.mock import MagicMock
+from uuid import uuid4
 
 import pytest
 from flask import Flask
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session, sessionmaker
 from werkzeug.exceptions import Forbidden
 
 import controllers.web.human_input_form as human_input_module
@@ -16,13 +18,21 @@ import controllers.web.site as site_module
 from controllers.web.error import WebFormRateLimitExceededError
 from core.workflow.nodes.human_input.entities import ParagraphInputConfig, SelectInputConfig, StringListSource
 from core.workflow.nodes.human_input.enums import ValueSourceType
+from models import Tenant
+from models.enums import CustomizeTokenStrategy
 from models.human_input import RecipientType
+from models.model import App, AppMode, IconType, Site
 from services.feature_service import FeatureModel
 from services.human_input_service import FormExpiredError
 
 HumanInputFormApi = human_input_module.HumanInputFormApi
 HumanInputFormUploadTokenApi = human_input_module.HumanInputFormUploadTokenApi
-TenantStatus = human_input_module.TenantStatus
+
+SQLITE_MODELS = (Tenant, App, Site)
+pytestmark = [
+    pytest.mark.usefixtures("sqlite_session"),
+    pytest.mark.parametrize("sqlite_session", [SQLITE_MODELS], indirect=True),
+]
 
 
 @pytest.fixture
@@ -34,36 +44,65 @@ def app() -> Flask:
     return app
 
 
-class _FakeSession:
-    """Simple stand-in for db.session that returns pre-seeded objects."""
+@pytest.fixture
+def database_session(
+    sqlite_session: Session,
+    sqlite_engine: Engine,
+    monkeypatch: pytest.MonkeyPatch,
+) -> Session:
+    """Bind model/controller database access to the shared SQLite session."""
 
-    def __init__(self, mapping: dict[str, Any]):
-        self._mapping = mapping
-
-    def get(self, model, ident):
-        return self._mapping.get(model.__name__)
-
-    def scalar(self, stmt):
-        # Extract the model name from the select statement's column_descriptions
-        try:
-            name = stmt.column_descriptions[0]["entity"].__name__
-        except (AttributeError, IndexError, KeyError):
-            return None
-        return self._mapping.get(name)
+    database = SimpleNamespace(engine=sqlite_engine, session=sqlite_session)
+    monkeypatch.setattr(human_input_module, "db", database)
+    monkeypatch.setattr("models.model.db", database)
+    return sqlite_session
 
 
-class _FakeDB:
-    """Minimal db stub exposing engine and session."""
-
-    def __init__(self, session: _FakeSession):
-        self.session = session
-        self.engine = object()
+def _persist_app_site(session: Session, *, include_site: bool = True) -> tuple[Tenant, App, Site | None]:
+    tenant = Tenant(name="Tenant", plan="basic")
+    tenant.custom_config_dict = {"remove_webapp_brand": True, "replace_webapp_logo": None}
+    app_model = App(
+        id=str(uuid4()),
+        tenant_id=tenant.id,
+        name="Human Input App",
+        mode=AppMode.CHAT,
+        icon_type=IconType.EMOJI,
+        icon="robot",
+        icon_background="#fff",
+        enable_site=True,
+        enable_api=False,
+    )
+    site = None
+    models: list[object] = [tenant, app_model]
+    if include_site:
+        site = Site(
+            app_id=app_model.id,
+            title="My Site",
+            default_language="en",
+            customize_token_strategy=CustomizeTokenStrategy.UUID,
+            icon_type=IconType.EMOJI,
+            icon="robot",
+            icon_background="#fff",
+            description="desc",
+            input_placeholder="Ask the app",
+            chat_color_theme="light",
+            chat_color_theme_inverted=False,
+            custom_disclaimer="",
+            prompt_public=False,
+            show_workflow_steps=True,
+            use_icon_as_answer_icon=False,
+        )
+        models.append(site)
+    session.add_all(models)
+    session.commit()
+    return tenant, app_model, site
 
 
-def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask, database_session: Session):
     """GET returns form definition merged with site payload."""
 
     expiration_time = datetime(2099, 1, 1, tzinfo=UTC)
+    _, app_model, _ = _persist_app_site(database_session)
 
     class _FakeDefinition:
         def model_dump(self, mode: str | None = None):
@@ -77,9 +116,9 @@ def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
 
     class _FakeForm:
         def __init__(self, expiration: datetime):
-            self.workflow_run_id = "workflow-1"
-            self.app_id = "app-1"
-            self.tenant_id = "tenant-1"
+            self.workflow_run_id = None
+            self.app_id = app_model.id
+            self.tenant_id = app_model.tenant_id
             self.expiration_time = expiration
             self.recipient_type = RecipientType.BACKSTAGE
 
@@ -92,32 +131,6 @@ def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
     monkeypatch.setattr(human_input_module, "_FORM_ACCESS_RATE_LIMITER", limiter_mock)
     monkeypatch.setattr(human_input_module, "extract_remote_ip", lambda req: "203.0.113.10")
 
-    tenant = SimpleNamespace(
-        id="tenant-1",
-        status=TenantStatus.NORMAL,
-        plan="basic",
-        custom_config_dict={"remove_webapp_brand": True, "replace_webapp_logo": False},
-    )
-    app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant, enable_site=True)
-    workflow_run = SimpleNamespace(app_id="app-1")
-    site_model = SimpleNamespace(
-        title="My Site",
-        icon_type="emoji",
-        icon="robot",
-        icon_background="#fff",
-        description="desc",
-        input_placeholder="Ask the app",
-        default_language="en",
-        chat_color_theme="light",
-        chat_color_theme_inverted=False,
-        copyright=None,
-        privacy_policy=None,
-        custom_disclaimer="",
-        prompt_public=False,
-        show_workflow_steps=True,
-        use_icon_as_answer_icon=False,
-    )
-
     # Patch service to return fake form.
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = form
@@ -125,10 +138,6 @@ def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
     service_mock.resolve_form_inputs.return_value = [resolved_input]
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
 
-    # Patch db session.
-    db_stub = _FakeDB(_FakeSession({"WorkflowRun": workflow_run, "App": app_model, "Site": site_model}))
-    monkeypatch.setattr(human_input_module, "db", db_stub)
-
     monkeypatch.setattr(
         site_module.FeatureService,
         "get_features",
@@ -153,7 +162,7 @@ def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
     assert body["user_actions"] == [{"id": "approve", "title": "Approve", "button_style": "default"}]
     assert body["expiration_time"] == int(expiration_time.timestamp())
     assert body["site"] == {
-        "app_id": "app-1",
+        "app_id": app_model.id,
         "end_user_id": None,
         "enable_site": True,
         "site": {
@@ -187,10 +196,11 @@ def test_get_form_includes_site(monkeypatch: pytest.MonkeyPatch, app: Flask):
     limiter_mock.increment_rate_limit.assert_called_once_with("203.0.113.10")
 
 
-def test_get_form_uses_runtime_select_options(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_get_form_uses_runtime_select_options(monkeypatch: pytest.MonkeyPatch, app: Flask, database_session: Session):
     """GET returns variable-backed select options resolved from runtime state."""
 
     expiration_time = datetime(2099, 1, 1, tzinfo=UTC)
+    _, app_model, _ = _persist_app_site(database_session)
     configured_inputs = [
         {
             "type": "select",
@@ -225,9 +235,9 @@ def test_get_form_uses_runtime_select_options(monkeypatch: pytest.MonkeyPatch, a
 
     class _FakeForm:
         def __init__(self, expiration: datetime):
-            self.workflow_run_id = "workflow-1"
-            self.app_id = "app-1"
-            self.tenant_id = "tenant-1"
+            self.workflow_run_id = None
+            self.app_id = app_model.id
+            self.tenant_id = app_model.tenant_id
             self.recipient_type = RecipientType.STANDALONE_WEB_APP
             self.expiration_time = expiration
 
@@ -239,37 +249,11 @@ def test_get_form_uses_runtime_select_options(monkeypatch: pytest.MonkeyPatch, a
     monkeypatch.setattr(human_input_module, "_FORM_ACCESS_RATE_LIMITER", limiter_mock)
     monkeypatch.setattr(human_input_module, "extract_remote_ip", lambda req: "203.0.113.10")
 
-    tenant = SimpleNamespace(
-        id="tenant-1",
-        status=TenantStatus.NORMAL,
-        plan="basic",
-        custom_config_dict={},
-    )
-    app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant, enable_site=True)
-    site_model = SimpleNamespace(
-        title="My Site",
-        icon_type="emoji",
-        icon="robot",
-        icon_background="#fff",
-        description="desc",
-        input_placeholder="Ask the app",
-        default_language="en",
-        chat_color_theme="light",
-        chat_color_theme_inverted=False,
-        copyright=None,
-        privacy_policy=None,
-        custom_disclaimer="",
-        prompt_public=False,
-        show_workflow_steps=True,
-        use_icon_as_answer_icon=False,
-    )
-
     form = _FakeForm(expiration_time)
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = form
     service_mock.resolve_form_inputs.return_value = runtime_inputs
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
-    monkeypatch.setattr(human_input_module, "db", _FakeDB(_FakeSession({"App": app_model, "Site": site_model})))
 
     def mock_get_features(tenant_id: str, exclude_vector_space: bool = False):
         return FeatureModel(can_replace_logo=True)
@@ -284,7 +268,9 @@ def test_get_form_uses_runtime_select_options(monkeypatch: pytest.MonkeyPatch, a
     service_mock.resolve_form_inputs.assert_called_once_with(form)
 
 
-def test_create_upload_token_returns_token_and_form_expiration(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_create_upload_token_returns_token_and_form_expiration(
+    monkeypatch: pytest.MonkeyPatch, app: Flask, sqlite_engine: Engine
+):
     """POST returns a HITL upload token for an active form token."""
 
     expiration_time = datetime(2099, 1, 1, tzinfo=UTC)
@@ -312,7 +298,7 @@ def test_create_upload_token_returns_token_and_form_expiration(monkeypatch: pyte
         "HumanInputFileUploadService",
         _service_factory,
     )
-    monkeypatch.setattr(human_input_module, "db", SimpleNamespace(engine=object()))
+    monkeypatch.setattr(human_input_module, "db", SimpleNamespace(engine=sqlite_engine))
 
     limiter_mock = MagicMock()
     limiter_mock.is_rate_limited.return_value = False
@@ -329,14 +315,18 @@ def test_create_upload_token_returns_token_and_form_expiration(monkeypatch: pyte
     }
     repo_factory.assert_called_once()
     assert captured["workflow_run_repository"] is workflow_run_repository
+    session_factory = captured["session_factory"]
+    assert isinstance(session_factory, sessionmaker)
+    assert session_factory.kw["bind"] is sqlite_engine
     service_mock.issue_upload_token.assert_called_once_with("token-1")
     limiter_mock.increment_rate_limit.assert_called_once_with("203.0.113.10")
 
 
-def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: Flask, database_session: Session):
     """GET returns form payload for backstage token."""
 
     expiration_time = datetime(2099, 1, 2, tzinfo=UTC)
+    _, app_model, _ = _persist_app_site(database_session)
 
     class _FakeDefinition:
         def model_dump(self, mode: str | None = None):
@@ -350,9 +340,9 @@ def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: F
 
     class _FakeForm:
         def __init__(self, expiration: datetime):
-            self.workflow_run_id = "workflow-1"
-            self.app_id = "app-1"
-            self.tenant_id = "tenant-1"
+            self.workflow_run_id = None
+            self.app_id = app_model.id
+            self.tenant_id = app_model.tenant_id
             self.expiration_time = expiration
 
         def get_definition(self):
@@ -363,40 +353,11 @@ def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: F
     limiter_mock.is_rate_limited.return_value = False
     monkeypatch.setattr(human_input_module, "_FORM_ACCESS_RATE_LIMITER", limiter_mock)
     monkeypatch.setattr(human_input_module, "extract_remote_ip", lambda req: "203.0.113.10")
-    tenant = SimpleNamespace(
-        id="tenant-1",
-        status=TenantStatus.NORMAL,
-        plan="basic",
-        custom_config_dict={"remove_webapp_brand": True, "replace_webapp_logo": False},
-    )
-    app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant, enable_site=True)
-    workflow_run = SimpleNamespace(app_id="app-1")
-    site_model = SimpleNamespace(
-        title="My Site",
-        icon_type="emoji",
-        icon="robot",
-        icon_background="#fff",
-        description="desc",
-        input_placeholder="Ask the app",
-        default_language="en",
-        chat_color_theme="light",
-        chat_color_theme_inverted=False,
-        copyright=None,
-        privacy_policy=None,
-        custom_disclaimer="",
-        prompt_public=False,
-        show_workflow_steps=True,
-        use_icon_as_answer_icon=False,
-    )
-
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = form
     service_mock.resolve_form_inputs.return_value = []
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
 
-    db_stub = _FakeDB(_FakeSession({"WorkflowRun": workflow_run, "App": app_model, "Site": site_model}))
-    monkeypatch.setattr(human_input_module, "db", db_stub)
-
     monkeypatch.setattr(
         site_module.FeatureService,
         "get_features",
@@ -421,7 +382,7 @@ def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: F
     assert body["user_actions"] == []
     assert body["expiration_time"] == int(expiration_time.timestamp())
     assert body["site"] == {
-        "app_id": "app-1",
+        "app_id": app_model.id,
         "end_user_id": None,
         "enable_site": True,
         "site": {
@@ -455,10 +416,13 @@ def test_get_form_allows_backstage_token(monkeypatch: pytest.MonkeyPatch, app: F
     limiter_mock.increment_rate_limit.assert_called_once_with("203.0.113.10")
 
 
-def test_get_form_raises_forbidden_when_site_missing(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_get_form_raises_forbidden_when_site_missing(
+    monkeypatch: pytest.MonkeyPatch, app: Flask, database_session: Session
+):
     """GET raises Forbidden if site cannot be resolved."""
 
     expiration_time = datetime(2099, 1, 3, tzinfo=UTC)
+    _, app_model, _ = _persist_app_site(database_session, include_site=False)
 
     class _FakeDefinition:
         def model_dump(self, mode: str | None = None):
@@ -472,9 +436,9 @@ def test_get_form_raises_forbidden_when_site_missing(monkeypatch: pytest.MonkeyP
 
     class _FakeForm:
         def __init__(self, expiration: datetime):
-            self.workflow_run_id = "workflow-1"
-            self.app_id = "app-1"
-            self.tenant_id = "tenant-1"
+            self.workflow_run_id = None
+            self.app_id = app_model.id
+            self.tenant_id = app_model.tenant_id
             self.expiration_time = expiration
 
         def get_definition(self):
@@ -485,17 +449,10 @@ def test_get_form_raises_forbidden_when_site_missing(monkeypatch: pytest.MonkeyP
     limiter_mock.is_rate_limited.return_value = False
     monkeypatch.setattr(human_input_module, "_FORM_ACCESS_RATE_LIMITER", limiter_mock)
     monkeypatch.setattr(human_input_module, "extract_remote_ip", lambda req: "203.0.113.10")
-    tenant = SimpleNamespace(status=TenantStatus.NORMAL)
-    app_model = SimpleNamespace(id="app-1", tenant_id="tenant-1", tenant=tenant)
-    workflow_run = SimpleNamespace(app_id="app-1")
-
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = form
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
 
-    db_stub = _FakeDB(_FakeSession({"WorkflowRun": workflow_run, "App": app_model, "Site": None}))
-    monkeypatch.setattr(human_input_module, "db", db_stub)
-
     with app.test_request_context("/api/form/human_input/token-1", method="GET"):
         with pytest.raises(Forbidden):
             HumanInputFormApi().get("token-1")
@@ -503,7 +460,7 @@ def test_get_form_raises_forbidden_when_site_missing(monkeypatch: pytest.MonkeyP
     limiter_mock.increment_rate_limit.assert_called_once_with("203.0.113.10")
 
 
-def test_submit_form_accepts_backstage_token(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_submit_form_accepts_backstage_token(monkeypatch: pytest.MonkeyPatch, app: Flask, sqlite_engine: Engine):
     """POST forwards backstage submissions to the service."""
 
     class _FakeForm:
@@ -517,7 +474,7 @@ def test_submit_form_accepts_backstage_token(monkeypatch: pytest.MonkeyPatch, ap
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = form
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
-    monkeypatch.setattr(human_input_module, "db", _FakeDB(_FakeSession({})))
+    monkeypatch.setattr(human_input_module, "db", SimpleNamespace(engine=sqlite_engine))
 
     with app.test_request_context(
         "/api/form/human_input/token-1",
@@ -550,7 +507,6 @@ def test_submit_form_rate_limited(monkeypatch: pytest.MonkeyPatch, app: Flask):
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = None
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
-    monkeypatch.setattr(human_input_module, "db", _FakeDB(_FakeSession({})))
 
     with app.test_request_context(
         "/api/form/human_input/token-1",
@@ -576,7 +532,6 @@ def test_get_form_rate_limited(monkeypatch: pytest.MonkeyPatch, app: Flask):
     service_mock = MagicMock()
     service_mock.get_form_by_token.return_value = None
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
-    monkeypatch.setattr(human_input_module, "db", _FakeDB(_FakeSession({})))
 
     with app.test_request_context("/api/form/human_input/token-1", method="GET"):
         with pytest.raises(WebFormRateLimitExceededError):
@@ -587,7 +542,7 @@ def test_get_form_rate_limited(monkeypatch: pytest.MonkeyPatch, app: Flask):
     service_mock.get_form_by_token.assert_not_called()
 
 
-def test_get_form_raises_expired(monkeypatch: pytest.MonkeyPatch, app: Flask):
+def test_get_form_raises_expired(monkeypatch: pytest.MonkeyPatch, app: Flask, sqlite_engine: Engine):
     class _FakeForm:
         pass
 
@@ -600,7 +555,7 @@ def test_get_form_raises_expired(monkeypatch: pytest.MonkeyPatch, app: Flask):
     service_mock.get_form_by_token.return_value = form
     service_mock.ensure_form_active.side_effect = FormExpiredError("form-id")
     monkeypatch.setattr(human_input_module, "HumanInputService", lambda engine: service_mock)
-    monkeypatch.setattr(human_input_module, "db", _FakeDB(_FakeSession({})))
+    monkeypatch.setattr(human_input_module, "db", SimpleNamespace(engine=sqlite_engine))
 
     with app.test_request_context("/api/form/human_input/token-1", method="GET"):
         with pytest.raises(FormExpiredError):

api/tests/unit_tests/controllers/web/test_passport.py

@@ -1,8 +1,11 @@
 from __future__ import annotations
 
-from types import SimpleNamespace
+from unittest.mock import patch
+from uuid import NAMESPACE_URL, UUID, uuid5
 
 import pytest
+from sqlalchemy import select
+from sqlalchemy.orm import Session
 from werkzeug.exceptions import NotFound, Unauthorized
 
 from controllers.web.error import WebAppAuthRequiredError
@@ -12,9 +15,41 @@ from controllers.web.passport import (
     exchange_token_for_existing_web_user,
     generate_session_id,
 )
+from models.enums import CustomizeTokenStrategy, EndUserType
+from models.model import App, AppMode, EndUser, IconType, Site
 from services.webapp_auth_service import WebAppAuthType
 
 
+def _stable_uuid(value: str) -> str:
+    return str(uuid5(NAMESPACE_URL, value))
+
+
+def _persist_webapp(session: Session, *, app_code: str = "code") -> tuple[App, Site]:
+    tenant_id = _stable_uuid(f"tenant:{app_code}")
+    app_model = App(
+        id=_stable_uuid(f"app:{app_code}"),
+        tenant_id=tenant_id,
+        name="Web App",
+        mode=AppMode.CHAT,
+        icon_type=IconType.EMOJI,
+        icon="chat",
+        icon_background="#FFFFFF",
+        enable_site=True,
+        enable_api=False,
+    )
+    site = Site(
+        id=_stable_uuid(f"site:{app_code}"),
+        app_id=app_model.id,
+        title="Web App Site",
+        default_language="en-US",
+        customize_token_strategy=CustomizeTokenStrategy.UUID,
+        code=app_code,
+    )
+    session.add_all([app_model, site])
+    session.commit()
+    return app_model, site
+
+
 def test_decode_enterprise_webapp_user_id_none() -> None:
     assert decode_enterprise_webapp_user_id(None) is None
 
@@ -31,70 +66,68 @@ def test_decode_enterprise_webapp_user_id_valid(monkeypatch: pytest.MonkeyPatch)
     assert decode_enterprise_webapp_user_id("token") == decoded
 
 
-def test_exchange_token_public_flow(monkeypatch: pytest.MonkeyPatch) -> None:
-    site = SimpleNamespace(id="s1", app_id="a1", code="code", status="normal")
-    app_model = SimpleNamespace(id="a1", status="normal", enable_site=True)
-    call_state = {"calls": 0}
-
-    def _scalar_side_effect(*_args, **_kwargs):
-        call_state["calls"] += 1
-        return site if call_state["calls"] == 1 else app_model
-
-    db_session = SimpleNamespace(scalar=_scalar_side_effect)
-    monkeypatch.setattr("controllers.web.passport.db", SimpleNamespace(session=db_session))
-    monkeypatch.setattr("controllers.web.passport._exchange_for_public_app_token", lambda *_args, **_kwargs: "resp")
+@pytest.mark.parametrize("sqlite_session", [(App, Site)], indirect=True)
+def test_exchange_token_public_flow(sqlite_session: Session) -> None:
+    app_model, site = _persist_webapp(sqlite_session)
 
     decoded = {"auth_type": "public"}
-    result = exchange_token_for_existing_web_user("code", decoded, WebAppAuthType.PUBLIC)
+    with (
+        patch("controllers.web.passport.db.session", sqlite_session),
+        patch("controllers.web.passport._exchange_for_public_app_token", return_value="resp") as exchange_mock,
+    ):
+        result = exchange_token_for_existing_web_user("code", decoded, WebAppAuthType.PUBLIC)
+
     assert result == "resp"
+    exchange_mock.assert_called_once_with(app_model, site, decoded)
 
 
-def test_exchange_token_requires_external(monkeypatch: pytest.MonkeyPatch) -> None:
-    site = SimpleNamespace(id="s1", app_id="a1", code="code", status="normal")
-    app_model = SimpleNamespace(id="a1", status="normal", enable_site=True)
-    call_state = {"calls": 0}
-
-    def _scalar_side_effect(*_args, **_kwargs):
-        call_state["calls"] += 1
-        return site if call_state["calls"] == 1 else app_model
-
-    db_session = SimpleNamespace(scalar=_scalar_side_effect)
-    monkeypatch.setattr("controllers.web.passport.db", SimpleNamespace(session=db_session))
+@pytest.mark.parametrize("sqlite_session", [(App, Site)], indirect=True)
+def test_exchange_token_requires_external(sqlite_session: Session) -> None:
+    _persist_webapp(sqlite_session)
 
     decoded = {"auth_type": "internal"}
-    with pytest.raises(WebAppAuthRequiredError):
+    with (
+        patch("controllers.web.passport.db.session", sqlite_session),
+        pytest.raises(WebAppAuthRequiredError),
+    ):
         exchange_token_for_existing_web_user("code", decoded, WebAppAuthType.EXTERNAL)
 
 
-def test_exchange_token_missing_session_id(monkeypatch: pytest.MonkeyPatch) -> None:
-    site = SimpleNamespace(id="s1", app_id="a1", code="code", status="normal")
-    app_model = SimpleNamespace(id="a1", status="normal", enable_site=True, tenant_id="t1")
-    call_state = {"calls": 0}
-
-    def _scalar_side_effect(*_args, **_kwargs):
-        call_state["calls"] += 1
-        if call_state["calls"] == 1:
-            return site
-        if call_state["calls"] == 2:
-            return app_model
-        return None
-
-    db_session = SimpleNamespace(scalar=_scalar_side_effect, add=lambda *_a, **_k: None, commit=lambda: None)
-    monkeypatch.setattr("controllers.web.passport.db", SimpleNamespace(session=db_session))
+@pytest.mark.parametrize("sqlite_session", [(App, Site, EndUser)], indirect=True)
+def test_exchange_token_missing_session_id(sqlite_session: Session) -> None:
+    _persist_webapp(sqlite_session)
 
     decoded = {"auth_type": "internal"}
-    with pytest.raises(NotFound):
+    with (
+        patch("controllers.web.passport.db.session", sqlite_session),
+        pytest.raises(NotFound),
+    ):
         exchange_token_for_existing_web_user("code", decoded, WebAppAuthType.INTERNAL)
+    assert sqlite_session.scalars(select(EndUser)).all() == []
 
 
-def test_generate_session_id(monkeypatch: pytest.MonkeyPatch) -> None:
-    counts = [1, 0]
+@pytest.mark.parametrize("sqlite_session", [(EndUser,)], indirect=True)
+def test_generate_session_id(sqlite_session: Session) -> None:
+    collision_id = _stable_uuid("session:collision")
+    generated_id = _stable_uuid("session:generated")
+    sqlite_session.add(
+        EndUser(
+            id=_stable_uuid("end-user:collision"),
+            tenant_id=_stable_uuid("tenant:collision"),
+            type=EndUserType.BROWSER,
+            name="Existing User",
+            session_id=collision_id,
+        )
+    )
+    sqlite_session.commit()
 
-    def _scalar(*_args, **_kwargs):
-        return counts.pop(0)
+    with (
+        patch("controllers.web.passport.db.session", sqlite_session),
+        patch(
+            "controllers.web.passport.uuid.uuid4",
+            side_effect=[UUID(collision_id), UUID(generated_id)],
+        ),
+    ):
+        session_id = generate_session_id()
 
-    db_session = SimpleNamespace(scalar=_scalar)
-    monkeypatch.setattr("controllers.web.passport.db", SimpleNamespace(session=db_session))
-
-    session_id = generate_session_id()
-    assert session_id
+    assert session_id == generated_id

api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py

@@ -81,13 +81,15 @@ def test_generate_includes_parent_trace_context_in_extras(monkeypatch):
         "core.app.apps.workflow.app_generator.file_factory.build_from_mappings", lambda *args, **kwargs: []
     )
     monkeypatch.setattr("core.app.apps.workflow.app_generator.TraceQueueManager", MagicMock())
+    workflow_execution_factory = MagicMock(return_value=MagicMock())
+    workflow_node_execution_factory = MagicMock(return_value=MagicMock())
     monkeypatch.setattr(
         "core.app.apps.workflow.app_generator.DifyCoreRepositoryFactory.create_workflow_execution_repository",
-        MagicMock(return_value=MagicMock()),
+        workflow_execution_factory,
     )
     monkeypatch.setattr(
         "core.app.apps.workflow.app_generator.DifyCoreRepositoryFactory.create_workflow_node_execution_repository",
-        MagicMock(return_value=MagicMock()),
+        workflow_node_execution_factory,
     )
     monkeypatch.setattr("core.app.apps.workflow.app_generator.db", SimpleNamespace(engine=MagicMock()))
     monkeypatch.setattr(generator, "_prepare_user_inputs", lambda *, user_inputs, **kwargs: user_inputs)
@@ -134,6 +136,8 @@ def test_generate_includes_parent_trace_context_in_extras(monkeypatch):
         "parent_node_execution_id": "outer-node-execution-1",
     }
     assert extras["trace_session_id"] == "session-1"
+    assert workflow_execution_factory.call_args.kwargs["tenant_id"] == "tenant-1"
+    assert workflow_node_execution_factory.call_args.kwargs["tenant_id"] == "tenant-1"
 
 
 def test_resume_delegates_to_generate(mocker: MockerFixture):

api/tests/unit_tests/core/external_data_tool/api/test_api.py

@@ -1,22 +1,51 @@
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
+from sqlalchemy.orm import Session
 
+import core.external_data_tool.api.api as api_module
 from core.external_data_tool.api.api import ApiExternalDataTool
-from models.api_based_extension import APIBasedExtensionPoint
+from models.api_based_extension import APIBasedExtension, APIBasedExtensionPoint
+
+pytestmark = [
+    pytest.mark.usefixtures("sqlite_session"),
+    pytest.mark.parametrize("sqlite_session", [(APIBasedExtension,)], indirect=True),
+]
+
+
+class _DatabaseBinding:
+    """Expose the real SQLite session used by extension queries."""
+
+    session: Session
+
+    def __init__(self, session: Session) -> None:
+        self.session = session
+
+
+@pytest.fixture(autouse=True)
+def bind_sqlite_session(sqlite_session: Session, monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(api_module, "db", _DatabaseBinding(sqlite_session))
+
+
+@pytest.fixture
+def api_extension(sqlite_session: Session) -> APIBasedExtension:
+    extension = APIBasedExtension(
+        tenant_id="tenant_id",
+        name="Test extension",
+        api_endpoint="http://api",
+        api_key="encrypted_key",
+    )
+    extension.id = "ext_id"
+    sqlite_session.add(extension)
+    sqlite_session.commit()
+    return extension
 
 
 def test_api_external_data_tool_name():
     assert ApiExternalDataTool.name == "api"
 
 
-@patch("core.external_data_tool.api.api.db")
-def test_validate_config_success(mock_db):
-    mock_extension = MagicMock()
-    mock_extension.id = "ext_id"
-    mock_extension.tenant_id = "tenant_id"
-    mock_db.session.scalar.return_value = mock_extension
-
+def test_validate_config_success(api_extension: APIBasedExtension):
     # Should not raise exception
     ApiExternalDataTool.validate_config("tenant_id", {"api_based_extension_id": "ext_id"})
 
@@ -26,10 +55,7 @@ def test_validate_config_missing_id():
         ApiExternalDataTool.validate_config("tenant_id", {})
 
 
-@patch("core.external_data_tool.api.api.db")
-def test_validate_config_invalid_id(mock_db):
-    mock_db.session.scalar.return_value = None
-
+def test_validate_config_invalid_id():
     with pytest.raises(ValueError, match="api_based_extension_id is invalid"):
         ApiExternalDataTool.validate_config("tenant_id", {"api_based_extension_id": "ext_id"})
 
@@ -42,16 +68,9 @@ def api_tool():
     )
 
 
-@patch("core.external_data_tool.api.api.db")
 @patch("core.external_data_tool.api.api.encrypter")
 @patch("core.external_data_tool.api.api.APIBasedExtensionRequestor")
-def test_query_success(mock_requestor_class, mock_encrypter, mock_db, api_tool):
-    mock_extension = MagicMock()
-    mock_extension.id = "ext_id"
-    mock_extension.tenant_id = "tenant_id"
-    mock_extension.api_endpoint = "http://api"
-    mock_extension.api_key = "encrypted_key"
-    mock_db.session.scalar.return_value = mock_extension
+def test_query_success(mock_requestor_class, mock_encrypter, api_tool, api_extension: APIBasedExtension):
     mock_encrypter.decrypt_token.return_value = "decrypted_key"
 
     mock_requestor = mock_requestor_class.return_value
@@ -81,24 +100,14 @@ def test_query_missing_extension_id():
         api_tool.query({}, "")
 
 
-@patch("core.external_data_tool.api.api.db")
-def test_query_invalid_extension(mock_db, api_tool):
-    mock_db.session.scalar.return_value = None
-
+def test_query_invalid_extension(api_tool):
     with pytest.raises(ValueError, match=".*error: api_based_extension_id is invalid"):
         api_tool.query({}, "")
 
 
-@patch("core.external_data_tool.api.api.db")
 @patch("core.external_data_tool.api.api.encrypter")
 @patch("core.external_data_tool.api.api.APIBasedExtensionRequestor")
-def test_query_requestor_init_error(mock_requestor_class, mock_encrypter, mock_db, api_tool):
-    mock_extension = MagicMock()
-    mock_extension.id = "ext_id"
-    mock_extension.tenant_id = "tenant_id"
-    mock_extension.api_endpoint = "http://api"
-    mock_extension.api_key = "encrypted_key"
-    mock_db.session.scalar.return_value = mock_extension
+def test_query_requestor_init_error(mock_requestor_class, mock_encrypter, api_tool, api_extension: APIBasedExtension):
     mock_encrypter.decrypt_token.return_value = "decrypted_key"
 
     mock_requestor_class.side_effect = Exception("init error")
@@ -107,16 +116,9 @@ def test_query_requestor_init_error(mock_requestor_class, mock_encrypter, mock_d
         api_tool.query({}, "")
 
 
-@patch("core.external_data_tool.api.api.db")
 @patch("core.external_data_tool.api.api.encrypter")
 @patch("core.external_data_tool.api.api.APIBasedExtensionRequestor")
-def test_query_no_result_in_response(mock_requestor_class, mock_encrypter, mock_db, api_tool):
-    mock_extension = MagicMock()
-    mock_extension.id = "ext_id"
-    mock_extension.tenant_id = "tenant_id"
-    mock_extension.api_endpoint = "http://api"
-    mock_extension.api_key = "encrypted_key"
-    mock_db.session.scalar.return_value = mock_extension
+def test_query_no_result_in_response(mock_requestor_class, mock_encrypter, api_tool, api_extension: APIBasedExtension):
     mock_encrypter.decrypt_token.return_value = "decrypted_key"
 
     mock_requestor = mock_requestor_class.return_value
@@ -126,16 +128,9 @@ def test_query_no_result_in_response(mock_requestor_class, mock_encrypter, mock_
         api_tool.query({}, "")
 
 
-@patch("core.external_data_tool.api.api.db")
 @patch("core.external_data_tool.api.api.encrypter")
 @patch("core.external_data_tool.api.api.APIBasedExtensionRequestor")
-def test_query_result_not_string(mock_requestor_class, mock_encrypter, mock_db, api_tool):
-    mock_extension = MagicMock()
-    mock_extension.id = "ext_id"
-    mock_extension.tenant_id = "tenant_id"
-    mock_extension.api_endpoint = "http://api"
-    mock_extension.api_key = "encrypted_key"
-    mock_db.session.scalar.return_value = mock_extension
+def test_query_result_not_string(mock_requestor_class, mock_encrypter, api_tool, api_extension: APIBasedExtension):
     mock_encrypter.decrypt_token.return_value = "decrypted_key"
 
     mock_requestor = mock_requestor_class.return_value

api/tests/unit_tests/core/llm_generator/test_llm_generator_missing.py

@@ -1,7 +1,6 @@
 import sys
 from unittest.mock import MagicMock, patch
 
-from core.app.app_config.entities import ModelConfig
 from core.llm_generator.llm_generator import LLMGenerator, _parse_string_list
 
 
@@ -112,37 +111,6 @@ class TestBuildSuggestionContext:
         assert LLMGenerator._build_suggestion_context("tenant") == ""
 
 
-class TestClassifyWorkflowMode:
-    @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
-    def test_model_error(self, mock_for_tenant):
-        mock_for_tenant.return_value.get_model_instance.side_effect = Exception("API error")
-
-        model_config = ModelConfig(provider="test", name="test", mode="chat")
-        assert LLMGenerator.classify_workflow_mode("tenant", "instruction", model_config) == "advanced-chat"
-
-    @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
-    def test_workflow_match(self, mock_for_tenant):
-        mock_model = MagicMock()
-        mock_model.invoke_llm.return_value = MagicMock()
-        mock_model.invoke_llm.return_value.message.get_text_content.return_value = "  workflow "
-
-        mock_for_tenant.return_value.get_model_instance.return_value = mock_model
-
-        model_config = ModelConfig(provider="test", name="test", mode="chat")
-        assert LLMGenerator.classify_workflow_mode("tenant", "instruction", model_config) == "workflow"
-
-    @patch("core.llm_generator.llm_generator.ModelManager.for_tenant")
-    def test_other_match(self, mock_for_tenant):
-        mock_model = MagicMock()
-        mock_model.invoke_llm.return_value = MagicMock()
-        mock_model.invoke_llm.return_value.message.get_text_content.return_value = "chatflow"
-
-        mock_for_tenant.return_value.get_model_instance.return_value = mock_model
-
-        model_config = ModelConfig(provider="test", name="test", mode="chat")
-        assert LLMGenerator.classify_workflow_mode("tenant", "instruction", model_config) == "advanced-chat"
-
-
 class TestWorkflowServiceInterface:
     def test_protocol_methods(self):
         # Just to cover the 'pass' statements in the Protocol definition

api/tests/unit_tests/core/repositories/test_celery_workflow_execution_repository.py

@@ -17,6 +17,8 @@ from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
 from models.enums import WorkflowRunTriggeredFrom
 
+RESOURCE_TENANT_ID = "resource-tenant-id"
+
 
 @pytest.fixture
 def mock_session_factory():
@@ -71,12 +73,13 @@ class TestCeleryWorkflowExecutionRepository:
 
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id=app_id,
             triggered_from=triggered_from,
         )
 
-        assert repo._tenant_id == mock_account.current_tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
         assert repo._app_id == app_id
         assert repo._triggered_from == triggered_from
         assert repo._creator_user_id == mock_account.id
@@ -86,13 +89,14 @@ class TestCeleryWorkflowExecutionRepository:
         """Test repository initialization basic functionality."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
         )
 
         # Verify basic initialization
-        assert repo._tenant_id == mock_account.current_tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
         assert repo._app_id == "test-app"
         assert repo._triggered_from == WorkflowRunTriggeredFrom.DEBUGGING
 
@@ -100,12 +104,13 @@ class TestCeleryWorkflowExecutionRepository:
         """Test repository initialization with EndUser."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_end_user,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
         )
 
-        assert repo._tenant_id == mock_end_user.tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
 
     def test_init_without_tenant_id_raises_error(self, mock_session_factory):
         """Test that initialization fails without tenant_id."""
@@ -114,19 +119,37 @@ class TestCeleryWorkflowExecutionRepository:
         user.current_tenant_id = None
         user.id = str(uuid4())
 
-        with pytest.raises(ValueError, match="User must have a tenant_id"):
+        with pytest.raises(ValueError, match="tenant_id is required"):
             CeleryWorkflowExecutionRepository(
                 session_factory=mock_session_factory,
+                tenant_id="",
                 user=user,
                 app_id="test-app",
                 triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
             )
 
+    def test_init_uses_resource_tenant_when_account_has_no_current_tenant(self, mock_session_factory):
+        user = Mock(spec=Account)
+        user.current_tenant_id = None
+        user.id = str(uuid4())
+
+        repo = CeleryWorkflowExecutionRepository(
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=user,
+            app_id="test-app",
+            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+        )
+
+        assert repo._tenant_id == RESOURCE_TENANT_ID
+        assert repo._creator_user_id == user.id
+
     @patch("core.repositories.celery_workflow_execution_repository.save_workflow_execution_task")
     def test_save_queues_celery_task(self, mock_task, mock_session_factory, mock_account, sample_workflow_execution):
         """Test that save operation queues a Celery task without tracking."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -139,7 +162,7 @@ class TestCeleryWorkflowExecutionRepository:
         call_args = mock_task.delay.call_args[1]
 
         assert call_args["execution_data"] == sample_workflow_execution.model_dump()
-        assert call_args["tenant_id"] == mock_account.current_tenant_id
+        assert call_args["tenant_id"] == RESOURCE_TENANT_ID
         assert call_args["app_id"] == "test-app"
         assert call_args["triggered_from"] == WorkflowRunTriggeredFrom.APP_RUN
         assert call_args["creator_user_id"] == mock_account.id
@@ -156,6 +179,7 @@ class TestCeleryWorkflowExecutionRepository:
 
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -171,6 +195,7 @@ class TestCeleryWorkflowExecutionRepository:
         """Test that save operation works in fire-and-forget mode."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -187,6 +212,7 @@ class TestCeleryWorkflowExecutionRepository:
         """Test multiple save operations work correctly."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -224,6 +250,7 @@ class TestCeleryWorkflowExecutionRepository:
         """Test save operation with different user types."""
         repo = CeleryWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=mock_end_user.tenant_id,
             user=mock_end_user,
             app_id="test-app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,

api/tests/unit_tests/core/repositories/test_celery_workflow_node_execution_repository.py

@@ -21,6 +21,8 @@ from libs.datetime_utils import naive_utc_now
 from models import Account, EndUser
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 
+RESOURCE_TENANT_ID = "resource-tenant-id"
+
 
 @pytest.fixture
 def mock_session_factory():
@@ -79,12 +81,13 @@ class TestCeleryWorkflowNodeExecutionRepository:
 
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id=app_id,
             triggered_from=triggered_from,
         )
 
-        assert repo._tenant_id == mock_account.current_tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
         assert repo._app_id == app_id
         assert repo._triggered_from == triggered_from
         assert repo._creator_user_id == mock_account.id
@@ -94,6 +97,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test repository initialization with cache properly initialized."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -106,12 +110,13 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test repository initialization with EndUser."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_end_user,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
         )
 
-        assert repo._tenant_id == mock_end_user.tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
 
     def test_init_without_tenant_id_raises_error(self, mock_session_factory):
         """Test that initialization fails without tenant_id."""
@@ -120,14 +125,31 @@ class TestCeleryWorkflowNodeExecutionRepository:
         user.current_tenant_id = None
         user.id = str(uuid4())
 
-        with pytest.raises(ValueError, match="User must have a tenant_id"):
+        with pytest.raises(ValueError, match="tenant_id is required"):
             CeleryWorkflowNodeExecutionRepository(
                 session_factory=mock_session_factory,
+                tenant_id="",
                 user=user,
                 app_id="test-app",
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
             )
 
+    def test_init_uses_resource_tenant_when_account_has_no_current_tenant(self, mock_session_factory):
+        user = Mock(spec=Account)
+        user.current_tenant_id = None
+        user.id = str(uuid4())
+
+        repo = CeleryWorkflowNodeExecutionRepository(
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=user,
+            app_id="test-app",
+            triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+        )
+
+        assert repo._tenant_id == RESOURCE_TENANT_ID
+        assert repo._creator_user_id == user.id
+
     @patch("core.repositories.celery_workflow_node_execution_repository.save_workflow_node_execution_task")
     def test_save_caches_and_queues_celery_task(
         self, mock_task, mock_session_factory, mock_account, sample_workflow_node_execution
@@ -135,6 +157,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test that save operation caches execution and queues a Celery task."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -147,7 +170,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         call_args = mock_task.delay.call_args[1]
 
         assert call_args["execution_data"] == sample_workflow_node_execution.model_dump()
-        assert call_args["tenant_id"] == mock_account.current_tenant_id
+        assert call_args["tenant_id"] == RESOURCE_TENANT_ID
         assert call_args["app_id"] == "test-app"
         assert call_args["triggered_from"] == WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN
         assert call_args["creator_user_id"] == mock_account.id
@@ -172,6 +195,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
 
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -187,6 +211,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test that get_by_workflow_execution retrieves executions from cache."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -209,6 +234,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test get_by_workflow_execution without order configuration."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -224,6 +250,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test cache operations work correctly."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -245,6 +272,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test multiple executions for the same workflow."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -296,6 +324,7 @@ class TestCeleryWorkflowNodeExecutionRepository:
         """Test ordering functionality works correctly."""
         repo = CeleryWorkflowNodeExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=mock_account.current_tenant_id,
             user=mock_account,
             app_id="test-app",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/unit_tests/core/repositories/test_factory.py

@@ -22,6 +22,8 @@ from models import Account, EndUser
 from models.enums import WorkflowRunTriggeredFrom
 from models.workflow import WorkflowNodeExecutionTriggeredFrom
 
+RESOURCE_TENANT_ID = "resource-tenant-id"
+
 
 class TestRepositoryFactory:
     """Test cases for RepositoryFactory."""
@@ -72,6 +74,7 @@ class TestRepositoryFactory:
         with patch("core.repositories.factory.import_string", return_value=mock_repository_class, autospec=True):
             result = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -80,6 +83,7 @@ class TestRepositoryFactory:
             # Verify the repository was created with correct parameters
             mock_repository_class.assert_called_once_with(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -98,6 +102,7 @@ class TestRepositoryFactory:
         with pytest.raises(RepositoryImportError) as exc_info:
             DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id="test-app-id",
                 triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -122,6 +127,7 @@ class TestRepositoryFactory:
             with pytest.raises(RepositoryImportError) as exc_info:
                 DifyCoreRepositoryFactory.create_workflow_execution_repository(
                     session_factory=mock_session_factory,
+                    tenant_id=RESOURCE_TENANT_ID,
                     user=mock_user,
                     app_id="test-app-id",
                     triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -149,6 +155,7 @@ class TestRepositoryFactory:
         with patch("core.repositories.factory.import_string", return_value=mock_repository_class, autospec=True):
             result = DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -157,6 +164,7 @@ class TestRepositoryFactory:
             # Verify the repository was created with correct parameters
             mock_repository_class.assert_called_once_with(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -175,6 +183,7 @@ class TestRepositoryFactory:
         with pytest.raises(RepositoryImportError) as exc_info:
             DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                 session_factory=mock_session_factory,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id="test-app-id",
                 triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -199,6 +208,7 @@ class TestRepositoryFactory:
             with pytest.raises(RepositoryImportError) as exc_info:
                 DifyCoreRepositoryFactory.create_workflow_node_execution_repository(
                     session_factory=mock_session_factory,
+                    tenant_id=RESOURCE_TENANT_ID,
                     user=mock_user,
                     app_id="test-app-id",
                     triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -232,6 +242,7 @@ class TestRepositoryFactory:
         with patch("core.repositories.factory.import_string", return_value=mock_repository_class, autospec=True):
             result = DifyCoreRepositoryFactory.create_workflow_execution_repository(
                 session_factory=mock_engine,  # Using Engine instead of sessionmaker
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,
@@ -240,6 +251,7 @@ class TestRepositoryFactory:
             # Verify the repository was created with correct parameters
             mock_repository_class.assert_called_once_with(
                 session_factory=mock_engine,
+                tenant_id=RESOURCE_TENANT_ID,
                 user=mock_user,
                 app_id=app_id,
                 triggered_from=triggered_from,

api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_execution_repository.py

@@ -12,6 +12,8 @@ from graphon.enums import WorkflowExecutionStatus, WorkflowType
 from models import Account, CreatorUserRole, EndUser, WorkflowRun
 from models.enums import WorkflowRunTriggeredFrom
 
+RESOURCE_TENANT_ID = "resource-tenant-id"
+
 
 @pytest.fixture
 def mock_session_factory():
@@ -74,11 +76,15 @@ class TestSQLAlchemyWorkflowExecutionRepository:
         triggered_from = WorkflowRunTriggeredFrom.APP_RUN
 
         repo = SQLAlchemyWorkflowExecutionRepository(
-            session_factory=mock_session_factory, user=mock_account, app_id=app_id, triggered_from=triggered_from
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=mock_account,
+            app_id=app_id,
+            triggered_from=triggered_from,
         )
 
         assert repo._session_factory == mock_session_factory
-        assert repo._tenant_id == mock_account.current_tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
         assert repo._app_id == app_id
         assert repo._triggered_from == triggered_from
         assert repo._creator_user_id == mock_account.id
@@ -87,6 +93,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_init_with_engine(self, mock_engine, mock_account):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_engine,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app_id",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -98,28 +105,60 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_init_invalid_session_factory(self, mock_account):
         with pytest.raises(ValueError, match="Invalid session_factory type"):
             SQLAlchemyWorkflowExecutionRepository(
-                session_factory="invalid", user=mock_account, app_id=None, triggered_from=None
+                session_factory="invalid",
+                tenant_id=RESOURCE_TENANT_ID,
+                user=mock_account,
+                app_id=None,
+                triggered_from=None,
             )
 
     def test_init_no_tenant_id(self, mock_session_factory):
         user = MagicMock(spec=Account)
         user.current_tenant_id = None
 
-        with pytest.raises(ValueError, match="User must have a tenant_id"):
+        with pytest.raises(ValueError, match="tenant_id is required"):
             SQLAlchemyWorkflowExecutionRepository(
-                session_factory=mock_session_factory, user=user, app_id=None, triggered_from=None
+                session_factory=mock_session_factory,
+                tenant_id="",
+                user=user,
+                app_id=None,
+                triggered_from=None,
             )
 
+    def test_init_uses_resource_tenant_when_account_has_no_current_tenant(self, mock_session_factory):
+        user = MagicMock(spec=Account)
+        user.current_tenant_id = None
+        user.id = str(uuid4())
+
+        repo = SQLAlchemyWorkflowExecutionRepository(
+            session_factory=mock_session_factory,
+            tenant_id="resource-tenant-id",
+            user=user,
+            app_id="test-app",
+            triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
+        )
+
+        assert repo._tenant_id == "resource-tenant-id"
+        assert repo._creator_user_id == user.id
+
     def test_init_with_end_user(self, mock_session_factory, mock_end_user):
         repo = SQLAlchemyWorkflowExecutionRepository(
-            session_factory=mock_session_factory, user=mock_end_user, app_id=None, triggered_from=None
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=mock_end_user,
+            app_id=None,
+            triggered_from=None,
         )
-        assert repo._tenant_id == mock_end_user.tenant_id
+        assert repo._tenant_id == RESOURCE_TENANT_ID
         assert repo._creator_user_role == CreatorUserRole.END_USER
 
     def test_to_domain_model(self, mock_session_factory, mock_account):
         repo = SQLAlchemyWorkflowExecutionRepository(
-            session_factory=mock_session_factory, user=mock_account, app_id=None, triggered_from=None
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=mock_account,
+            app_id=None,
+            triggered_from=None,
         )
 
         db_model = MagicMock(spec=WorkflowRun)
@@ -149,6 +188,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_to_db_model(self, mock_session_factory, mock_account, sample_workflow_execution):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app",
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -171,6 +211,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_to_db_model_edge_cases(self, mock_session_factory, mock_account, sample_workflow_execution):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app",
             triggered_from=WorkflowRunTriggeredFrom.DEBUGGING,
@@ -193,6 +234,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_to_db_model_app_id_none(self, mock_session_factory, mock_account, sample_workflow_execution):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id=None,
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -204,7 +246,11 @@ class TestSQLAlchemyWorkflowExecutionRepository:
 
     def test_to_db_model_missing_context(self, mock_session_factory, mock_account, sample_workflow_execution):
         repo = SQLAlchemyWorkflowExecutionRepository(
-            session_factory=mock_session_factory, user=mock_account, app_id=None, triggered_from=None
+            session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
+            user=mock_account,
+            app_id=None,
+            triggered_from=None,
         )
 
         # Test triggered_from missing
@@ -224,6 +270,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     def test_save(self, mock_session_factory, mock_account, sample_workflow_execution):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -245,6 +292,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     ):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,
@@ -267,6 +315,7 @@ class TestSQLAlchemyWorkflowExecutionRepository:
     ):
         repo = SQLAlchemyWorkflowExecutionRepository(
             session_factory=mock_session_factory,
+            tenant_id=RESOURCE_TENANT_ID,
             user=mock_account,
             app_id="test_app",
             triggered_from=WorkflowRunTriggeredFrom.APP_RUN,

api/tests/unit_tests/core/repositories/test_sqlalchemy_workflow_node_execution_repository.py

@@ -33,6 +33,8 @@ from models import Account, EndUser
 from models.enums import ExecutionOffLoadType
 from models.workflow import WorkflowNodeExecutionModel, WorkflowNodeExecutionOffload, WorkflowNodeExecutionTriggeredFrom
 
+RESOURCE_TENANT_ID = "tenant"
+
 
 def _mock_account(*, tenant_id: str = "tenant", user_id: str = "user") -> Account:
     user = Mock(spec=Account)
@@ -107,6 +109,7 @@ def test_init_accepts_engine_and_sessionmaker_and_sets_role(monkeypatch: pytest.
     engine: Engine = create_engine("sqlite:///:memory:")
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=engine,
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -116,6 +119,7 @@ def test_init_accepts_engine_and_sessionmaker_and_sets_role(monkeypatch: pytest.
     sm = Mock(spec=sessionmaker)
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=sm,
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_end_user(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
@@ -131,6 +135,7 @@ def test_init_rejects_invalid_session_factory_type(monkeypatch: pytest.MonkeyPat
     with pytest.raises(ValueError, match="Invalid session_factory type"):
         SQLAlchemyWorkflowNodeExecutionRepository(  # type: ignore[arg-type]
             session_factory=object(),
+            tenant_id=RESOURCE_TENANT_ID,
             user=_mock_account(),
             app_id=None,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -144,15 +149,36 @@ def test_init_requires_tenant_id(monkeypatch: pytest.MonkeyPatch) -> None:
     )
     user = _mock_account()
     user.current_tenant_id = None
-    with pytest.raises(ValueError, match="User must have a tenant_id"):
+    with pytest.raises(ValueError, match="tenant_id is required"):
         SQLAlchemyWorkflowNodeExecutionRepository(
             session_factory=Mock(spec=sessionmaker),
+            tenant_id="",
             user=user,
             app_id=None,
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
         )
 
 
+def test_init_uses_resource_tenant_when_account_has_no_current_tenant(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setattr(
+        "core.repositories.sqlalchemy_workflow_node_execution_repository.FileService",
+        lambda *_: SimpleNamespace(upload_file=Mock()),
+    )
+    user = _mock_account()
+    user.current_tenant_id = None
+
+    repo = SQLAlchemyWorkflowNodeExecutionRepository(
+        session_factory=Mock(spec=sessionmaker),
+        tenant_id="resource-tenant-id",
+        user=user,
+        app_id="app-id",
+        triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
+    )
+
+    assert repo._tenant_id == "resource-tenant-id"
+    assert repo._creator_user_id == user.id
+
+
 def test_create_truncator_uses_config(monkeypatch: pytest.MonkeyPatch) -> None:
     created: dict[str, Any] = {}
 
@@ -177,6 +203,7 @@ def test_create_truncator_uses_config(monkeypatch: pytest.MonkeyPatch) -> None:
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -206,6 +233,7 @@ def test_to_db_model_requires_constructor_context(monkeypatch: pytest.MonkeyPatc
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -214,6 +242,9 @@ def test_to_db_model_requires_constructor_context(monkeypatch: pytest.MonkeyPatc
 
     # Happy path: deterministic json dump should be sorted
     db_model = repo._to_db_model(execution)
+    assert db_model.tenant_id == RESOURCE_TENANT_ID
+    assert db_model.created_by == "user"
+    assert db_model.created_by_role.value == "account"
     assert json.loads(db_model.inputs or "{}") == {"a": 2, "b": 1}
     assert json.loads(db_model.execution_metadata or "{}")["total_tokens"] == 1
 
@@ -229,6 +260,7 @@ def test_to_db_model_requires_creator_user_id_and_role(monkeypatch: pytest.Monke
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -256,6 +288,7 @@ def test_is_duplicate_key_error_and_regenerate_id(
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -285,6 +318,7 @@ def test_persist_to_database_updates_existing_and_inserts_new(monkeypatch: pytes
     session = MagicMock()
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -318,6 +352,7 @@ def test_truncate_and_upload_returns_none_when_no_values_or_not_truncated(monkey
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -337,8 +372,10 @@ def test_truncate_and_upload_uploads_and_builds_offload(monkeypatch: pytest.Monk
     uploaded: dict[str, Any] = {}
 
     class FakeFileService:
-        def upload_file(self, *, filename: str, content: bytes, mimetype: str, user: Any):  # type: ignore[no-untyped-def]
-            uploaded.update({"filename": filename, "content": content, "mimetype": mimetype, "user": user})
+        def upload_file(self, *, filename: str, content: bytes, mimetype: str, user: Any, tenant_id: str):  # type: ignore[no-untyped-def]
+            uploaded.update(
+                {"filename": filename, "content": content, "mimetype": mimetype, "user": user, "tenant_id": tenant_id}
+            )
             return SimpleNamespace(id="file-id", key="file-key")
 
     monkeypatch.setattr(
@@ -348,6 +385,7 @@ def test_truncate_and_upload_uploads_and_builds_offload(monkeypatch: pytest.Monk
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -363,6 +401,7 @@ def test_truncate_and_upload_uploads_and_builds_offload(monkeypatch: pytest.Monk
     assert result is not None
     assert result.truncated_value == {"truncated": True}
     assert uploaded["filename"].startswith("node_execution_exec_inputs.json")
+    assert uploaded["tenant_id"] == RESOURCE_TENANT_ID
     assert result.offload.file_id == "file-id"
     assert result.offload.type_ == ExecutionOffLoadType.INPUTS
 
@@ -374,6 +413,7 @@ def test_to_domain_model_loads_offloaded_files(monkeypatch: pytest.MonkeyPatch)
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -428,6 +468,7 @@ def test_to_domain_model_returns_early_when_no_offload_data(monkeypatch: pytest.
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -491,6 +532,7 @@ def test_save_execution_data_handles_existing_db_model_and_truncation(monkeypatc
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -538,6 +580,7 @@ def test_save_execution_data_truncates_outputs_and_process_data(monkeypatch: pyt
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -583,6 +626,7 @@ def test_save_execution_data_handles_missing_db_model(monkeypatch: pytest.Monkey
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -608,6 +652,7 @@ def test_save_retries_duplicate_and_logs_non_duplicate(
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -647,6 +692,7 @@ def test_save_logs_and_reraises_on_unexpected_error(
     )
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -691,6 +737,7 @@ def test_get_db_models_by_workflow_run_orders_and_caches(monkeypatch: pytest.Mon
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id="app",
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -728,6 +775,7 @@ def test_get_db_models_by_workflow_run_uses_asc_order(monkeypatch: pytest.Monkey
     session.scalars.return_value.all.return_value = []
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=_session_factory(session),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,
@@ -743,6 +791,7 @@ def test_get_by_workflow_run_maps_to_domain(monkeypatch: pytest.MonkeyPatch) ->
 
     repo = SQLAlchemyWorkflowNodeExecutionRepository(
         session_factory=Mock(spec=sessionmaker),
+        tenant_id=RESOURCE_TENANT_ID,
         user=_mock_account(),
         app_id=None,
         triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/unit_tests/core/repositories/test_workflow_node_execution_conflict_handling.py

@@ -35,6 +35,7 @@ class TestWorkflowNodeExecutionConflictHandling:
         # Create repository instance
         self.repository = SQLAlchemyWorkflowNodeExecutionRepository(
             session_factory=self.mock_session_factory,
+            tenant_id="test-tenant-id",
             user=self.mock_user,
             app_id="test-app-id",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/unit_tests/core/repositories/test_workflow_node_execution_truncation.py

@@ -128,6 +128,7 @@ class TestSQLAlchemyWorkflowNodeExecutionRepositoryTruncation:
         """Create a repository instance for testing."""
         return SQLAlchemyWorkflowNodeExecutionRepository(
             session_factory=MagicMock(spec=Engine),
+            tenant_id="test-tenant-id",
             user=mock_user(),
             app_id="test-app-id",
             triggered_from=WorkflowNodeExecutionTriggeredFrom.WORKFLOW_RUN,

api/tests/unit_tests/core/tools/test_tool_label_manager.py

@@ -1,15 +1,28 @@
 from __future__ import annotations
 
-from types import SimpleNamespace
 from typing import Any, override
-from unittest.mock import MagicMock, PropertyMock, patch
+from unittest.mock import PropertyMock, patch
 
 import pytest
+from sqlalchemy import select
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import Session
 
+import core.tools.tool_label_manager as tool_label_manager_module
 from core.tools.builtin_tool.provider import BuiltinToolProviderController
 from core.tools.custom_tool.provider import ApiToolProviderController
 from core.tools.tool_label_manager import ToolLabelManager
 from core.tools.workflow_as_tool.provider import WorkflowToolProviderController
+from models.tools import ToolLabelBinding
+
+
+class _DatabaseBinding:
+    """Expose the SQLite engine to code that owns its session lifecycle."""
+
+    engine: Engine
+
+    def __init__(self, engine: Engine) -> None:
+        self.engine = engine
 
 
 # Create a mock class for testing abstract/base classes
@@ -39,7 +52,8 @@ def test_tool_label_manager_filter_tool_labels():
     assert len(filtered) == 2
 
 
-def test_tool_label_manager_update_tool_labels_db():
+@pytest.mark.parametrize("sqlite_session", [(ToolLabelBinding,)], indirect=True)
+def test_tool_label_manager_update_tool_labels_db(sqlite_session: Session):
     """
     Test the database update logic for tool labels.
     Focus: Verify that labels are filtered, de-duplicated, and safely handled within a database session.
@@ -49,48 +63,18 @@ def test_tool_label_manager_update_tool_labels_db():
     expected_id = controller.provider_id
     expected_type = controller.provider_type
 
-    # 2. Patching External Dependencies
-    # - We patch 'db' to prevent Flask from trying to access a real database.
-    # - We patch 'sessionmaker' to intercept and control the creation of SQLAlchemy sessions.
-    with (
-        patch("core.tools.tool_label_manager.db"),
-        patch("core.tools.tool_label_manager.sessionmaker") as mock_sessionmaker,
-    ):
-        # 3. Constructing the "Mocking Chain"
-        # In the business logic, we use: with sessionmaker(db.engine).begin() as _session:
-        # We need to link our 'mock_session' to the end of this complex context manager chain:
-        # Step A: sessionmaker(db.engine) -> returns an object (mock_sessionmaker.return_value)
-        # Step B: .begin() -> returns a context manager (begin.return_value)
-        # Step C: with ... as _session: -> calls __enter__(), and _session gets the __enter__.return_value
-        mock_session = MagicMock()
-        mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
+    sqlite_session.add(ToolLabelBinding(tool_id=expected_id, tool_type=expected_type, label_name="news"))
+    sqlite_session.commit()
 
-        # 4. Trigger the logic under test
-        # Input: ["search", "search", "invalid"]
-        # Logic:
-        #   - "invalid" should be filtered out (not in default_tool_label_name_list).
-        #   - The duplicate "search" should be merged (unique labels).
-        ToolLabelManager.update_tool_labels(controller, ["search", "search", "invalid"])
+    # Duplicate and unknown labels are filtered before the existing binding is replaced.
+    ToolLabelManager.update_tool_labels(controller, ["search", "search", "invalid"], session=sqlite_session)
+    sqlite_session.commit()
 
-        # 5. Behavior Assertion: DELETE operation
-        # Verify that the manager first attempts to clear existing labels for this specific tool.
-        # This ensures the update is idempotent.
-        mock_session.execute.assert_called_once()
-
-        # 6. Behavior Assertion: INSERT operation
-        # Verify that only ONE valid label ("search") was added after filtering and deduplication.
-        # If call_count == 1, it proves filter_tool_labels() worked as expected.
-        assert mock_session.add.call_count == 1
-
-        # 7. State Assertion: Data Integrity & Isolation
-        # Inspect the actual object passed to session.add() to ensure it has correct properties.
-        # This confirms that the data isolation (tool_id + tool_type) we refactored is active.
-        call_args = mock_session.add.call_args
-        added_label = call_args[0][0]  # Retrieve the ToolLabelBinding instance
-
-        assert added_label.label_name == "search", "The label name should be 'search' after filtering."
-        assert added_label.tool_id == expected_id, "The tool_id must match the provider_id for correct binding."
-        assert added_label.tool_type == expected_type, "Isolation failed: tool_type must be verified during update."
+    bindings = list(sqlite_session.scalars(select(ToolLabelBinding)).all())
+    assert len(bindings) == 1
+    assert bindings[0].label_name == "search"
+    assert bindings[0].tool_id == expected_id
+    assert bindings[0].tool_type == expected_type
 
 
 # Test error handling
@@ -100,7 +84,10 @@ def test_tool_label_manager_update_tool_labels_unsupported():
 
 
 # Test retrieval logic
-def test_tool_label_manager_get_tool_labels_for_builtin_and_db():
+@pytest.mark.parametrize("sqlite_session", [(ToolLabelBinding,)], indirect=True)
+def test_tool_label_manager_get_tool_labels_for_builtin_and_db(
+    monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine, sqlite_session: Session
+):
     # Mocking a property (@property) using PropertyMock
     with patch.object(
         _ConcreteBuiltinToolProviderController,
@@ -112,18 +99,17 @@ def test_tool_label_manager_get_tool_labels_for_builtin_and_db():
         assert ToolLabelManager.get_tool_labels(builtin) == ["search", "news"]
 
     api = _api_controller("api-1")
-    with (
-        patch("core.tools.tool_label_manager.db"),
-        patch("core.tools.tool_label_manager.sessionmaker") as mock_sessionmaker,
-    ):
-        mock_session = MagicMock()
-        mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
+    sqlite_session.add_all(
+        [
+            ToolLabelBinding(tool_id=api.provider_id, tool_type=api.provider_type, label_name="search"),
+            ToolLabelBinding(tool_id=api.provider_id, tool_type=api.provider_type, label_name="news"),
+        ]
+    )
+    sqlite_session.commit()
+    monkeypatch.setattr(tool_label_manager_module, "db", _DatabaseBinding(sqlite_engine))
 
-        # Inject mock data into the query result: session.scalars(stmt).all()
-        mock_session.scalars.return_value.all.return_value = ["search", "news"]
-
-        labels = ToolLabelManager.get_tool_labels(api)
-        assert labels == ["search", "news"]
+    labels = ToolLabelManager.get_tool_labels(api)
+    assert set(labels) == {"search", "news"}
 
 
 def test_tool_label_manager_get_tool_labels_unsupported():
@@ -137,33 +123,30 @@ def test_tool_label_manager_get_tool_labels_unsupported():
 
 
 # Test batch processing and mapping
-def test_tool_label_manager_get_tools_labels_batch():
+@pytest.mark.parametrize("sqlite_session", [(ToolLabelBinding,)], indirect=True)
+def test_tool_label_manager_get_tools_labels_batch(
+    monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine, sqlite_session: Session
+):
     assert ToolLabelManager.get_tools_labels([]) == {}
 
     api = _api_controller("api-1")
     wf = _workflow_controller("wf-1")
 
-    # SimpleNamespace is a quick way to simulate SQLAlchemy row objects
-    records = [
-        SimpleNamespace(tool_id="api-1", label_name="search"),
-        SimpleNamespace(tool_id="api-1", label_name="news"),
-        SimpleNamespace(tool_id="wf-1", label_name="utilities"),
-    ]
+    sqlite_session.add_all(
+        [
+            ToolLabelBinding(tool_id=api.provider_id, tool_type=api.provider_type, label_name="search"),
+            ToolLabelBinding(tool_id=api.provider_id, tool_type=api.provider_type, label_name="news"),
+            ToolLabelBinding(tool_id=wf.provider_id, tool_type=wf.provider_type, label_name="utilities"),
+        ]
+    )
+    sqlite_session.commit()
+    monkeypatch.setattr(tool_label_manager_module, "db", _DatabaseBinding(sqlite_engine))
 
-    with (
-        patch("core.tools.tool_label_manager.db"),
-        patch("core.tools.tool_label_manager.sessionmaker") as mock_sessionmaker,
-    ):
-        mock_session = MagicMock()
-        mock_sessionmaker.return_value.begin.return_value.__enter__.return_value = mock_session
+    labels = ToolLabelManager.get_tools_labels([api, wf])
 
-        # Simulating the batch query result
-        mock_session.scalars.return_value.all.return_value = records
-
-        labels = ToolLabelManager.get_tools_labels([api, wf])
-
-    # Verify the final dictionary mapping
-    assert labels == {"api-1": ["search", "news"], "wf-1": ["utilities"]}
+    assert labels.keys() == {"api-1", "wf-1"}
+    assert set(labels["api-1"]) == {"search", "news"}
+    assert labels["wf-1"] == ["utilities"]
 
 
 def test_tool_label_manager_get_tools_labels_unsupported():

api/tests/unit_tests/core/workflow/generator/test_prompts.py

@@ -1,25 +1,31 @@
-"""
-Unit tests for the planner / builder prompt format helpers.
+"""Unit tests for compact planner and per-node builder prompt helpers."""
 
-These helpers are pure string-shaping functions that wrap conditional sections
-into the LLM prompts. We assert they (1) emit empty strings when the source
-data is empty so the prompt stays tight, (2) include the relevant header text
-when data is present, and (3) round-trip the raw catalogue text unchanged.
-"""
+import json
 
-from core.workflow.generator.prompts.builder_prompts import (
-    BUILDER_SYSTEM_PROMPT_ADVANCED_CHAT,
-    BUILDER_SYSTEM_PROMPT_WORKFLOW,
-    compact_graph_for_builder,
-    format_builder_existing_graph_section,
-    format_builder_tool_catalogue_section,
-    format_plan_block,
-    get_builder_system_prompt,
+from core.workflow.generator.prompts.node_builder_prompts import (
+    format_mode_section,
+    format_parallel_plan,
+    format_start_inputs_section,
+    get_node_builder_system_prompt,
+)
+from core.workflow.generator.prompts.node_builder_prompts import (
+    format_tool_catalogue_section as format_node_tool_catalogue_section,
 )
 from core.workflow.generator.prompts.planner_prompts import (
+    PLANNER_SYSTEM_PROMPT,
+    format_existing_graph_section,
     format_ideal_output_section,
-    format_tool_catalogue_section,
 )
+from core.workflow.generator.prompts.planner_prompts import (
+    format_tool_catalogue_section as format_planner_tool_catalogue_section,
+)
+
+
+class TestPlannerSystemPrompt:
+    def test_documents_the_mode_output_field(self):
+        """Auto-mode resolution rides on the planner echoing its mode choice."""
+        assert '"mode": "workflow | advanced-chat"' in PLANNER_SYSTEM_PROMPT
+        assert "When the ``# Mode`` section says auto, YOU decide" in PLANNER_SYSTEM_PROMPT
 
 
 class TestFormatIdealOutputSection:
@@ -29,269 +35,129 @@ class TestFormatIdealOutputSection:
 
     def test_wraps_content_in_a_labelled_section(self):
         out = format_ideal_output_section("A short summary.")
+
         assert out.startswith("# Ideal output")
         assert "A short summary." in out
         assert out.endswith("\n\n")
 
 
-class TestPlannerCatalogueSection:
-    def test_returns_empty_when_catalogue_is_blank(self):
-        # No installed tools — the planner shouldn't see an "Available tools"
-        # heading at all; an empty string keeps the prompt tight.
-        assert format_tool_catalogue_section("") == ""
-        assert format_tool_catalogue_section("   ") == ""
+class TestToolCatalogueSections:
+    def test_planner_returns_empty_when_catalogue_is_blank(self):
+        assert format_planner_tool_catalogue_section("") == ""
+        assert format_planner_tool_catalogue_section("   ") == ""
+
+    def test_planner_includes_catalogue(self):
+        out = format_planner_tool_catalogue_section("- google/search — Search.")
 
-    def test_emits_a_planner_facing_header_with_the_catalogue(self):
-        out = format_tool_catalogue_section("- google/search — Search.")
         assert "# Available tools" in out
         assert "planner" in out.lower()
         assert "- google/search — Search." in out
 
+    def test_node_builder_returns_empty_when_catalogue_is_blank(self):
+        assert format_node_tool_catalogue_section("") == ""
 
-class TestBuilderCatalogueSection:
-    def test_returns_empty_when_catalogue_is_blank(self):
-        assert format_builder_tool_catalogue_section("") == ""
+    def test_node_builder_requires_exact_provider_and_tool_ids(self):
+        out = format_node_tool_catalogue_section("- google/search — Search.")
 
-    def test_includes_strict_provider_tool_guidance(self):
-        out = format_builder_tool_catalogue_section("- google/search — Search.")
-        # The builder must be told to use the *exact* identifiers — hallucinated
-        # tools fail at sync time.
         assert "exact" in out.lower()
         assert "provider_id" in out
         assert "tool_name" in out
         assert "- google/search — Search." in out
 
 
-class TestFormatPlanBlock:
-    def test_renders_one_line_per_node(self):
-        out = format_plan_block(
-            [
-                {"label": "Start", "node_type": "start", "purpose": "Take input"},
-                {"label": "Summarize", "node_type": "llm", "purpose": "Summarize"},
-            ]
-        )
-        lines = out.split("\n")
-        # Two nodes → 4 lines (each entry takes id-line + purpose-line).
-        assert any(line.startswith("1.") and "node1" in line for line in lines)
-        assert any(line.startswith("2.") and "node2" in line for line in lines)
-        assert "purpose: Take input" in out
-        assert "purpose: Summarize" in out
+class TestNodeBuilderPrompt:
+    def test_only_includes_target_node_schema_and_compact_output_contract(self):
+        prompt = get_node_builder_system_prompt("llm")
 
-    def test_handles_missing_fields_gracefully(self):
-        out = format_plan_block([{"node_type": "llm"}])
-        # Missing label/purpose must not raise — they degrade to empty strings.
-        assert "node1" in out
-        assert "type=llm" in out
-
-
-class TestGetBuilderSystemPrompt:
-    def test_returns_workflow_prompt_for_workflow_mode(self):
-        # The two prompts are structurally similar but differ in their
-        # mode-specific rules block.
-        prompt = get_builder_system_prompt("workflow")
-        assert prompt is BUILDER_SYSTEM_PROMPT_WORKFLOW
-        assert 'exactly one "end" node' in prompt
-
-    def test_returns_advanced_chat_prompt_for_advanced_chat_mode(self):
-        prompt = get_builder_system_prompt("advanced-chat")
-        assert prompt is BUILDER_SYSTEM_PROMPT_ADVANCED_CHAT
-        assert 'exactly one "answer" node' in prompt
-
-    def test_scopes_cheatsheet_to_planned_node_types(self):
-        # When the runner pins the plan's node-type set, the builder prompt
-        # carries ONLY those types' schemas — no schema for unrelated nodes.
-        prompt = get_builder_system_prompt("workflow", {"start", "llm", "end"})
-        assert "- start:" in prompt
+        assert '"config"' in prompt
         assert "- llm:" in prompt
         assert "- if-else:" not in prompt
-        assert "- tool" not in prompt
-        assert "## Containers" not in prompt
-        # Still a valid, mode-correct prompt.
-        assert 'exactly one "end" node' in prompt
+        assert '"viewport":' not in prompt
+        assert '"positionAbsolute":' not in prompt
 
-    def test_scoped_prompt_pulls_in_containers_for_iteration(self):
-        prompt = get_builder_system_prompt("workflow", {"start", "iteration", "llm", "end"})
-        assert "## Containers" in prompt
+    def test_supports_main_human_input_and_assigner_contracts(self):
+        human_input = get_node_builder_system_prompt("human-input")
+        assigner = get_node_builder_system_prompt("assigner")
 
-    def test_scoped_prompt_is_smaller_than_full(self):
-        # The whole point of dynamic assembly: a small plan ships a smaller
-        # builder prompt than the full cheatsheet.
-        scoped = get_builder_system_prompt("workflow", {"start", "llm", "end"})
-        assert len(scoped) < len(BUILDER_SYSTEM_PROMPT_WORKFLOW)
+        assert "delivery_methods" in human_input
+        assert "user_actions" in human_input
+        assert '"version": "2"' in assigner
+        assert "variable_selector" in assigner
 
-    def test_documents_multi_retrieval_fan_in(self):
-        prompt = get_builder_system_prompt(
-            "workflow",
-            {"start", "knowledge-retrieval", "llm", "end"},
+    def test_common_node_prompts_stay_small(self):
+        sizes = [len(get_node_builder_system_prompt(node_type)) for node_type in ("start", "llm", "end")]
+
+        assert max(sizes) < 3000
+
+    def test_unknown_node_type_gets_minimal_fallback(self):
+        prompt = get_node_builder_system_prompt("future-node")
+
+        assert "future-node" in prompt
+        assert "minimum valid config fields" in prompt
+
+
+class TestNodeBuilderUserSections:
+    def test_formats_start_inputs(self):
+        out = format_start_inputs_section(
+            [{"variable": "url", "label": "URL", "type": "text-input"}, {"variable": "", "label": "Ignored"}]
         )
 
-        assert "context.variable_selector accepts only one selector" in prompt
-        assert 'value_selector: ["node2", "result"]' in prompt
-        assert 'value_selector: ["node3", "result"]' in prompt
-        assert "edge from EACH retrieval node to the template" in prompt
-        assert 'template\'s ``["<template-node-id>", "output"]``' in prompt
+        assert "variable='url'" in out
+        assert "type='text-input'" in out
+        assert "Ignored" not in out
 
+    def test_empty_start_inputs_are_omitted(self):
+        assert format_start_inputs_section([]) == ""
 
-class TestBuildNodeConfigCheatsheet:
-    def test_none_returns_full_cheatsheet(self):
-        from core.workflow.generator.prompts.builder_prompts import (
-            NODE_CONFIG_CHEATSHEET,
-            build_node_config_cheatsheet,
+    def test_parallel_plan_is_compact_and_preserves_topology(self):
+        rendered = format_parallel_plan(
+            [{"id": "node1", "node_type": "start"}, {"id": "node2", "node_type": "end"}],
+            [{"source": "node1", "target": "node2"}],
         )
 
-        full = build_node_config_cheatsheet(None)
-        assert full == NODE_CONFIG_CHEATSHEET
-        # Full cheatsheet documents every node type + containers.
-        assert "- tool" in full
-        assert "- if-else:" in full
-        assert "## Containers" in full
+        assert " " not in rendered
+        assert json.loads(rendered)["edges"] == [{"source": "node1", "target": "node2"}]
+        assert "start_inputs" not in json.loads(rendered)
 
-    def test_always_includes_start_even_when_omitted(self):
-        # Every workflow has a start node; the assembler force-includes it so
-        # the builder can always declare input variables.
-        from core.workflow.generator.prompts.builder_prompts import build_node_config_cheatsheet
-
-        out = build_node_config_cheatsheet({"llm", "end"})
-        assert "- start:" in out
-
-    def test_start_snippet_documents_file_upload_schema(self):
-        # The bug this fixes: a file start variable needs allowed_file_types,
-        # which the builder never knew about. The snippet must now teach it.
-        from core.workflow.generator.prompts.builder_prompts import build_node_config_cheatsheet
-
-        out = build_node_config_cheatsheet({"start", "document-extractor", "llm", "end"})
-        assert "allowed_file_types" in out
-        assert "allowed_file_upload_methods" in out
-        assert "supported file types" in out  # the exact Studio error wording
-
-
-class TestFormatPlanBlockParentHints:
-    def test_resolves_parent_label_to_node_id(self):
-        # The planner emits parent="Per Item" as a hint; the builder needs the
-        # resolved id ("node-N") to set parentId on the inner node.
-        from core.workflow.generator.prompts.builder_prompts import format_plan_block
-
-        out = format_plan_block(
-            [
-                {"label": "Start", "node_type": "start", "purpose": "x"},
-                {"label": "Per Item", "node_type": "iteration", "purpose": "iterate"},
-                {"label": "Sum Item", "node_type": "llm", "purpose": "summarize one", "parent": "Per Item"},
-            ]
+    def test_parallel_plan_carries_declared_start_inputs(self):
+        rendered = format_parallel_plan(
+            [{"id": "node1", "node_type": "start"}],
+            [],
+            [{"variable": "url", "label": "URL", "type": "text-input"}],
         )
-        # The inner line should mention parent=node2 (the iteration node).
-        assert "parent=node2" in out
-        # Top-level nodes must not have a parent clause.
-        first_line = out.splitlines()[0]
-        assert "parent=" not in first_line
 
-    def test_omits_parent_clause_when_label_is_unknown(self):
-        # A typo / unknown parent label should degrade to quoting the raw
-        # label string rather than fabricating a node id.
-        from core.workflow.generator.prompts.builder_prompts import format_plan_block
+        assert json.loads(rendered)["start_inputs"] == [{"variable": "url", "label": "URL", "type": "text-input"}]
 
-        out = format_plan_block(
-            [
-                {"label": "Start", "node_type": "start", "purpose": "x"},
-                {"label": "Step", "node_type": "code", "purpose": "x", "parent": "Ghost Container"},
-            ]
+
+class TestModeSection:
+    def test_advanced_chat_documents_system_variables(self):
+        out = format_mode_section("advanced-chat")
+
+        assert "sys.query" in out
+        assert '["sys", "query"]' in out
+        assert "do NOT invent start-node variables" in out
+
+    def test_workflow_mode_forbids_system_variables(self):
+        out = format_mode_section("workflow")
+
+        assert "NO automatic system variables" in out
+
+
+class TestExistingGraphSection:
+    def test_edge_lines_surface_branch_source_handles(self):
+        out = format_existing_graph_section(
+            {
+                "nodes": [{"id": "node1", "data": {"type": "if-else", "title": "Branch"}}],
+                "edges": [
+                    {"source": "node1", "target": "node2", "sourceHandle": "case-uuid-1"},
+                    {"source": "node2", "target": "node3", "sourceHandle": "source"},
+                ],
+            }
         )
-        assert "parent='Ghost Container'" in out
 
+        assert "- node1 -> node2 (source_handle='case-uuid-1')" in out
+        assert "- node2 -> node3\n" in out
+        assert "copy its source_handle verbatim" in out
 
-class TestCompactGraphForBuilder:
-    """
-    The refine-mode existing-graph JSON is the single biggest token sink in
-    the pipeline — and the builder echoes untouched nodes back, doubling the
-    cost. The compactor must drop canvas noise (recomputed in postprocess)
-    while keeping everything the builder genuinely has to preserve.
-    """
-
-    @staticmethod
-    def _graph() -> dict:
-        return {
-            "nodes": [
-                {
-                    "id": "node1",
-                    "type": "custom",
-                    "position": {"x": 80, "y": 282},
-                    "positionAbsolute": {"x": 80, "y": 282},
-                    "width": 244,
-                    "height": 100,
-                    "sourcePosition": "right",
-                    "targetPosition": "left",
-                    "selected": True,
-                    "data": {"type": "start", "title": "Start", "variables": []},
-                },
-                {
-                    "id": "iter1",
-                    "type": "custom",
-                    "position": {"x": 400, "y": 282},
-                    "width": 808,
-                    "height": 204,
-                    "data": {"type": "iteration", "title": "Per Item", "start_node_id": "iter1start"},
-                },
-                {
-                    "id": "iter1start",
-                    "type": "custom-iteration-start",
-                    "parentId": "iter1",
-                    "position": {"x": 60, "y": 78},
-                    "positionAbsolute": {"x": 460, "y": 360},
-                    "data": {"type": "iteration-start", "title": ""},
-                },
-            ],
-            "edges": [
-                {
-                    "id": "node1-source-iter1-target",
-                    "source": "node1",
-                    "target": "iter1",
-                    "sourceHandle": "source",
-                    "targetHandle": "target",
-                    "type": "custom",
-                    "zIndex": 0,
-                    "data": {"sourceType": "start", "targetType": "iteration", "isInIteration": False},
-                }
-            ],
-            "viewport": {"x": 0, "y": 0, "zoom": 0.7},
-        }
-
-    def test_drops_canvas_noise_from_top_level_nodes(self):
-        compact = compact_graph_for_builder(self._graph())
-        start = next(n for n in compact["nodes"] if n["id"] == "node1")
-        for key in ("position", "positionAbsolute", "width", "height", "sourcePosition", "targetPosition", "selected"):
-            assert key not in start
-        # Semantics survive.
-        assert start["data"]["type"] == "start"
-        assert start["type"] == "custom"
-
-    def test_keeps_container_size_but_not_position(self):
-        compact = compact_graph_for_builder(self._graph())
-        container = next(n for n in compact["nodes"] if n["id"] == "iter1")
-        assert container["width"] == 808
-        assert container["height"] == 204
-        assert "position" not in container
-
-    def test_keeps_child_relative_position(self):
-        compact = compact_graph_for_builder(self._graph())
-        child = next(n for n in compact["nodes"] if n["id"] == "iter1start")
-        assert child["position"] == {"x": 60, "y": 78}
-        assert child["parentId"] == "iter1"
-        assert child["type"] == "custom-iteration-start"
-        assert "positionAbsolute" not in child
-
-    def test_edges_keep_only_topology_fields(self):
-        compact = compact_graph_for_builder(self._graph())
-        assert compact["edges"] == [
-            {"source": "node1", "target": "iter1", "sourceHandle": "source", "targetHandle": "target"}
-        ]
-
-    def test_viewport_is_dropped(self):
-        assert "viewport" not in compact_graph_for_builder(self._graph())
-
-    def test_existing_graph_section_embeds_the_compact_graph(self):
-        section = format_builder_existing_graph_section(self._graph())
-        assert "Existing graph to refine" in section
-        assert "positionAbsolute" not in section
-        assert '"start_node_id":"iter1start"' in section
-
-    def test_existing_graph_section_empty_for_create_mode(self):
-        assert format_builder_existing_graph_section(None) == ""
+    def test_create_mode_renders_nothing(self):
+        assert format_existing_graph_section(None) == ""

api/tests/unit_tests/core/workflow/test_node_factory.py

@@ -3,6 +3,8 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, patch, sentinel
 
 import pytest
+from sqlalchemy import Engine
+from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext, InvokeFrom, UserFrom
 from core.plugin.impl.model import PluginModelClient
@@ -23,6 +25,33 @@ from graphon.nodes.llm.node import LLMNode
 from graphon.nodes.llm.runtime_protocols import LLMPollingCapableProtocol
 from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
 from graphon.variables.segments import ArrayObjectSegment, StringSegment
+from models.base import TypeBase
+from models.model import AppMode, Conversation, ConversationFromSource
+
+
+@pytest.fixture
+def memory_session_maker(monkeypatch: pytest.MonkeyPatch, sqlite_engine: Engine) -> sessionmaker[Session]:
+    """Bind node memory lookup to an explicit SQLite session factory."""
+
+    TypeBase.metadata.create_all(sqlite_engine, tables=[Conversation.__table__])
+    session_maker = sessionmaker(sqlite_engine, expire_on_commit=False)
+    monkeypatch.setattr(node_factory.session_factory, "create_session", session_maker)
+    return session_maker
+
+
+def _persist_conversation(session_maker: sessionmaker[Session]) -> None:
+    with session_maker.begin() as session:
+        session.add(
+            Conversation(
+                id="conversation-id",
+                app_id="app-id",
+                mode=AppMode.ADVANCED_CHAT,
+                name="Conversation",
+                _inputs={},
+                from_source=ConversationFromSource.API,
+                from_end_user_id="end-user-id",
+            )
+        )
 
 
 def _assert_constructor_node_data(data, *, node_id: str, node_type: NodeType, version: str = "1") -> None:
@@ -134,27 +163,7 @@ class TestFetchMemory:
 
         assert result is None
 
-    def test_returns_none_when_conversation_does_not_exist(self, monkeypatch: pytest.MonkeyPatch):
-        class FakeSelect:
-            def where(self, *_args):
-                return self
-
-        class FakeSession:
-            def __init__(self, *_args, **_kwargs):
-                pass
-
-            def __enter__(self):
-                return self
-
-            def __exit__(self, *_args):
-                return False
-
-            def scalar(self, _stmt):
-                return None
-
-        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
-        monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
-
+    def test_returns_none_when_conversation_does_not_exist(self, memory_session_maker: sessionmaker[Session]):
         result = node_factory.fetch_memory(
             conversation_id="conversation-id",
             app_id="app-id",
@@ -164,30 +173,12 @@ class TestFetchMemory:
 
         assert result is None
 
-    def test_builds_token_buffer_memory_for_existing_conversation(self, monkeypatch: pytest.MonkeyPatch):
-        conversation = sentinel.conversation
+    def test_builds_token_buffer_memory_for_existing_conversation(
+        self, monkeypatch: pytest.MonkeyPatch, memory_session_maker: sessionmaker[Session]
+    ):
         memory = sentinel.memory
-
-        class FakeSelect:
-            def where(self, *_args):
-                return self
-
-        class FakeSession:
-            def __init__(self, *_args, **_kwargs):
-                pass
-
-            def __enter__(self):
-                return self
-
-            def __exit__(self, *_args):
-                return False
-
-            def scalar(self, _stmt):
-                return conversation
-
+        _persist_conversation(memory_session_maker)
         token_buffer_memory = MagicMock(return_value=memory)
-        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
-        monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
         monkeypatch.setattr(node_factory, "TokenBufferMemory", token_buffer_memory)
 
         result = node_factory.fetch_memory(
@@ -198,35 +189,22 @@ class TestFetchMemory:
         )
 
         assert result is memory
-        token_buffer_memory.assert_called_once_with(
-            conversation=conversation,
-            model_instance=sentinel.model_instance,
-        )
-
-    def test_uses_configured_session_factory_without_flask_app_context(self, monkeypatch: pytest.MonkeyPatch):
-        class FakeSelect:
-            def where(self, *_args):
-                return self
-
-        class FakeSession:
-            def __enter__(self):
-                return self
-
-            def __exit__(self, *_args):
-                return False
-
-            def scalar(self, _stmt):
-                return sentinel.conversation
+        loaded_conversation = token_buffer_memory.call_args.kwargs["conversation"]
+        assert isinstance(loaded_conversation, Conversation)
+        assert loaded_conversation.id == "conversation-id"
+        assert token_buffer_memory.call_args.kwargs["model_instance"] is sentinel.model_instance
 
+    def test_uses_configured_session_factory_without_flask_app_context(
+        self, monkeypatch: pytest.MonkeyPatch, memory_session_maker: sessionmaker[Session]
+    ):
         class RaisingDB:
             @property
             def engine(self):
                 raise RuntimeError("Working outside of application context.")
 
         token_buffer_memory = MagicMock(return_value=sentinel.memory)
+        _persist_conversation(memory_session_maker)
         monkeypatch.setattr(node_factory, "db", RaisingDB(), raising=False)
-        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
-        monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
         monkeypatch.setattr(node_factory, "TokenBufferMemory", token_buffer_memory)
 
         result = node_factory.fetch_memory(

api/tests/unit_tests/dev/test_generate_knowledge_fs_contract.py

@@ -0,0 +1,266 @@
+"""Tests for pinned KnowledgeFS declaration validation."""
+
+import json
+import os
+import subprocess
+import sys
+from pathlib import Path
+from typing import cast
+
+import pytest
+
+from dev import generate_knowledge_fs_contract as contract_validator
+from dev.generate_knowledge_fs_contract import ContractDeclaration, validate_declarations
+
+
+def test_contract_cli_updates_checks_and_detects_openapi_drift(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    repository = tmp_path / "knowledge-fs"
+    repository.mkdir()
+    subprocess.run(["git", "init", "--quiet"], cwd=repository, check=True)
+    subprocess.run(
+        [
+            "git",
+            "-c",
+            "[email protected]",
+            "-c",
+            "user.name=Contract Test",
+            "commit",
+            "--allow-empty",
+            "--quiet",
+            "-m",
+            "fixture",
+        ],
+        cwd=repository,
+        check=True,
+    )
+    commit = subprocess.run(
+        ["git", "rev-parse", "HEAD"], cwd=repository, check=True, capture_output=True, text=True
+    ).stdout.strip()
+
+    document = {"paths": {"/health": {"get": operation(None, "getHealth", security=[])}}}
+    executable_directory = tmp_path / "bin"
+    executable_directory.mkdir()
+    fake_pnpm = executable_directory / "pnpm"
+    write_fake_pnpm(fake_pnpm, document)
+
+    lock_path = tmp_path / "knowledge-fs-contract.lock.json"
+    lock_path.write_text(
+        json.dumps(
+            {
+                "commit": "",
+                "openapiSha256": "",
+                "repository": "https://github.com/langgenius/knowledge-fs",
+            }
+        )
+    )
+    monkeypatch.setattr(contract_validator, "LOCK_PATH", lock_path)
+    monkeypatch.setenv("KNOWLEDGE_FS_REPO", str(repository))
+    monkeypatch.setenv("PATH", f"{executable_directory}{os.pathsep}{os.environ['PATH']}")
+
+    monkeypatch.setattr(sys, "argv", ["generate_knowledge_fs_contract.py", "--update-lock"])
+    contract_validator.main()
+
+    updated_lock = json.loads(lock_path.read_text())
+    assert updated_lock["commit"] == commit
+    assert set(updated_lock) == {"commit", "openapiSha256", "repository"}
+
+    monkeypatch.setattr(sys, "argv", ["generate_knowledge_fs_contract.py", "--check"])
+    contract_validator.main()
+
+    write_fake_pnpm(fake_pnpm, {"paths": {}})
+    with pytest.raises(RuntimeError, match="OpenAPI hash mismatch"):
+        contract_validator.main()
+
+
+def test_validate_declarations_accepts_matching_contract() -> None:
+    route = operation("knowledge-spaces:read", "listKnowledgeSpaces")
+    route["parameters"] = [{"in": "header", "name": "X-Trace-Id"}]
+    route["responses"] = {
+        "200": {
+            "content": {"application/json": {}},
+            "headers": {"X-Trace-Id": {}},
+        }
+    }
+    document = {"paths": {"/knowledge-spaces": {"get": route}}}
+
+    validate_declarations(
+        document,
+        (
+            declaration(
+                request_headers=("x-trace-id",),
+                response_headers=("x-trace-id",),
+            ),
+        ),
+    )
+
+
+@pytest.mark.parametrize(
+    ("field", "value"),
+    [
+        ("method", "POST"),
+        ("path", "spaces"),
+        ("required_scope", "knowledge-spaces:write"),
+        ("response_kind", "stream"),
+        ("max_response_bytes", 2_097_152),
+        ("request_headers", ("authorization",)),
+        ("response_headers", ("cache-control",)),
+        ("response_media_types", ("text/event-stream",)),
+    ],
+)
+def test_validate_declarations_reports_contract_field_drift(field: str, value: object) -> None:
+    document = {
+        "paths": {
+            "/knowledge-spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            }
+        }
+    }
+
+    with pytest.raises(ValueError, match=rf"listKnowledgeSpaces.*{field}.*expected.*received"):
+        validate_declarations(document, (declaration(**{field: value}),))
+
+
+def test_validate_declarations_rejects_unknown_operation_id() -> None:
+    with pytest.raises(ValueError, match="no operationId: listKnowledgeSpaces"):
+        validate_declarations({"paths": {}}, (declaration(),))
+
+
+def test_validate_declarations_rejects_duplicate_declared_operation_ids() -> None:
+    document = {
+        "paths": {
+            "/knowledge-spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            }
+        }
+    }
+
+    with pytest.raises(ValueError, match="registry has duplicate operationId: listKnowledgeSpaces"):
+        validate_declarations(document, (declaration(), declaration()))
+
+
+def test_validate_declarations_rejects_duplicate_upstream_operation_ids() -> None:
+    document = {
+        "paths": {
+            "/knowledge-spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            },
+            "/spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            },
+        }
+    }
+
+    with pytest.raises(ValueError, match="OpenAPI has duplicate operationId: listKnowledgeSpaces"):
+        validate_declarations(document, (declaration(),))
+
+
+def test_validate_declarations_ignores_undeclared_operations() -> None:
+    document = {
+        "paths": {
+            "/knowledge-spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            },
+            "/internal-maintenance": {
+                "head": {"responses": {"200": {}}},
+            },
+        }
+    }
+
+    validate_declarations(document, (declaration(),))
+
+
+def test_validate_declarations_preserves_public_operation_scope() -> None:
+    document = {"paths": {"/health": {"get": operation(None, "getHealth", security=[])}}}
+
+    validate_declarations(
+        document,
+        (
+            declaration(
+                operation_id="getHealth",
+                path="health",
+                required_scope=None,
+            ),
+        ),
+    )
+
+
+def test_validate_declarations_rejects_unsupported_declared_method() -> None:
+    document = {
+        "paths": {
+            "/knowledge-spaces": {
+                "head": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            }
+        }
+    }
+
+    with pytest.raises(ValueError, match="does not support HEAD /knowledge-spaces"):
+        validate_declarations(document, (declaration(method="HEAD"),))
+
+
+def test_validate_declarations_rejects_non_absolute_upstream_path() -> None:
+    document = {
+        "paths": {
+            "knowledge-spaces": {
+                "get": operation("knowledge-spaces:read", "listKnowledgeSpaces"),
+            }
+        }
+    }
+
+    with pytest.raises(ValueError, match="path must be absolute: knowledge-spaces"):
+        validate_declarations(document, (declaration(),))
+
+
+@pytest.mark.parametrize("value", [None, True, 0, "1048576"])
+def test_validate_declarations_rejects_invalid_response_byte_limits(value: object) -> None:
+    route = operation("knowledge-spaces:read", "listKnowledgeSpaces")
+    route["x-knowledge-fs-max-response-bytes"] = value
+
+    with pytest.raises(ValueError, match="no valid response byte limit"):
+        validate_declarations({"paths": {"/knowledge-spaces": {"get": route}}}, (declaration(),))
+
+
+def test_validate_declarations_rejects_request_header_references() -> None:
+    route = operation("knowledge-spaces:read", "listKnowledgeSpaces")
+    route["parameters"] = [{"$ref": "#/components/parameters/TraceId"}]
+
+    with pytest.raises(ValueError, match="request header references are not supported"):
+        validate_declarations({"paths": {"/knowledge-spaces": {"get": route}}}, (declaration(),))
+
+
+def operation(scope: str | None, operation_id: str, **overrides: object) -> dict[str, object]:
+    value: dict[str, object] = {
+        "operationId": operation_id,
+        "responses": {"200": {"content": {"application/json": {}}}},
+        "x-knowledge-fs-max-response-bytes": 1_048_576,
+    }
+    if scope is not None:
+        value["x-knowledge-fs-required-scope"] = scope
+    value.update(overrides)
+    return value
+
+
+def declaration(**overrides: object) -> ContractDeclaration:
+    value: dict[str, object] = {
+        "operation_id": "listKnowledgeSpaces",
+        "method": "GET",
+        "path": "knowledge-spaces",
+        "required_scope": "knowledge-spaces:read",
+        "response_kind": "buffered",
+        "max_response_bytes": 1_048_576,
+        "request_headers": (),
+        "response_headers": (),
+        "response_media_types": ("application/json",),
+    }
+    value.update(overrides)
+    return cast(ContractDeclaration, value)
+
+
+def write_fake_pnpm(path: Path, document: dict[str, object]) -> None:
+    path.write_text(
+        "#!/usr/bin/env python3\n"
+        "import sys\n"
+        "from pathlib import Path\n"
+        "output = Path(sys.argv[sys.argv.index('--output') + 1])\n"
+        f"output.write_text({json.dumps(document)!r})\n"
+    )
+    path.chmod(0o755)

api/tests/unit_tests/events/event_handlers/test_queue_default_plugin_install_when_tenant_created.py

@@ -0,0 +1,52 @@
+import logging
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+import pytest
+
+from events.event_handlers import queue_default_plugin_install_when_tenant_created as handler_module
+
+
+def test_handle_skips_when_no_default_plugins_are_configured(monkeypatch: pytest.MonkeyPatch) -> None:
+    delay = MagicMock()
+    monkeypatch.setattr(handler_module.dify_config, "NEW_USER_DEFAULT_PLUGIN_IDS", "")
+    monkeypatch.setattr(handler_module.install_default_plugins_task, "delay", delay)
+
+    handler_module.handle(SimpleNamespace(id="tenant-1"))
+
+    delay.assert_not_called()
+
+
+def test_handle_queues_configured_plugins(monkeypatch: pytest.MonkeyPatch) -> None:
+    delay = MagicMock()
+    plugins = [
+        "langgenius/openai",
+        "langgenius/gemini",
+    ]
+    monkeypatch.setattr(handler_module.dify_config, "NEW_USER_DEFAULT_PLUGIN_IDS", ",".join(plugins))
+    monkeypatch.setattr(handler_module.install_default_plugins_task, "delay", delay)
+
+    handler_module.handle(SimpleNamespace(id="tenant-1"))
+
+    delay.assert_called_once_with("tenant-1", plugins)
+
+
+def test_handle_does_not_fail_tenant_creation_when_queue_is_unavailable(
+    monkeypatch: pytest.MonkeyPatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    monkeypatch.setattr(
+        handler_module.dify_config,
+        "NEW_USER_DEFAULT_PLUGIN_IDS",
+        "langgenius/openai",
+    )
+    monkeypatch.setattr(
+        handler_module.install_default_plugins_task,
+        "delay",
+        MagicMock(side_effect=ConnectionError("broker unavailable")),
+    )
+
+    with caplog.at_level(logging.ERROR, logger=handler_module.logger.name):
+        handler_module.handle(SimpleNamespace(id="tenant-1"))
+
+    assert "Failed to queue default plugin installation for tenant tenant-1" in caplog.text

api/tests/unit_tests/services/agent/test_agent_dsl_service.py

@@ -1,6 +1,6 @@
 import json
 from types import SimpleNamespace
-from unittest.mock import Mock, call
+from unittest.mock import Mock
 
 import pytest
 from pydantic import ValidationError
@@ -19,7 +19,6 @@ from models.agent import (
     WorkflowAgentNodeBinding,
 )
 from models.agent_config_entities import AgentSoulConfig, WorkflowNodeJobConfig
-from models.model import App, IconType
 from services.agent.dsl_entities import (
     AGENT_NODE_JOB_DSL_KEY,
     AGENT_PACKAGE_REF_KEY,
@@ -153,6 +152,43 @@ def test_agent_package_round_trips_as_strict_dsl_dto() -> None:
     assert restored == package
 
 
+def test_agent_package_normalizes_legacy_null_missing_asset_file_ids() -> None:
+    package = make_portable_agent_package(
+        _agent(),
+        AgentSoulConfig.model_validate(
+            {
+                "config_skills": [{"name": "research", "file_id": "skill-file"}],
+                "config_files": [{"name": "guide.md", "file_kind": "tool_file", "file_id": "config-file"}],
+            }
+        ),
+    ).model_dump(mode="json")
+    package["soul"]["config_skills"][0]["file_id"] = None
+    package["soul"]["config_files"][0]["file_id"] = None
+
+    restored = AgentPackage.model_validate(package)
+
+    assert restored.soul.config_skills[0].file_id == ""
+    assert restored.soul.config_files[0].file_id == ""
+    assert restored.model_dump(mode="json")["soul"]["config_skills"][0]["file_id"] == ""
+    assert restored.model_dump(mode="json")["soul"]["config_files"][0]["file_id"] == ""
+
+
+@pytest.mark.parametrize(
+    "asset",
+    [
+        {"name": "research", "file_id": None, "is_missing": False},
+        {"name": "guide.md", "file_kind": "tool_file", "file_id": None, "is_missing": False},
+    ],
+)
+def test_agent_package_rejects_null_file_id_for_available_assets(asset: dict) -> None:
+    package = make_portable_agent_package(_agent(), AgentSoulConfig()).model_dump(mode="json")
+    target = "config_files" if "file_kind" in asset else "config_skills"
+    package["soul"][target] = [asset]
+
+    with pytest.raises(ValidationError):
+        AgentPackage.model_validate(package)
+
+
 def test_import_warnings_cover_runtime_setup_removed_from_package(monkeypatch) -> None:
     soul = AgentSoulConfig.model_validate(
         {
@@ -324,7 +360,7 @@ def test_import_agent_app_package_creates_config_and_unpublished_draft(monkeypat
     assert session.flush.call_count == 2
 
 
-def test_import_workflow_packages_replaces_bindings_and_reuses_roster_package() -> None:
+def test_import_workflow_packages_materializes_every_package_binding_as_inline() -> None:
     package = make_portable_agent_package(_agent(), AgentSoulConfig())
     graph = {
         "nodes": [
@@ -351,18 +387,15 @@ def test_import_workflow_packages_replaces_bindings_and_reuses_roster_package()
     session = Mock()
     session.scalars.return_value.all.return_value = [old_binding]
     service = AgentDslService(session)
-    roster_result = SimpleNamespace(
-        agent=SimpleNamespace(id="roster-agent"),
-        snapshot=SimpleNamespace(id="roster-snapshot"),
-        warnings=[DslImportWarning(code="roster", path="agent", message="roster warning")],
-    )
-    inline_result = SimpleNamespace(
-        agent=SimpleNamespace(id="inline-agent"),
-        snapshot=SimpleNamespace(id="inline-snapshot"),
-        warnings=[DslImportWarning(code="inline", path="agent", message="inline warning")],
-    )
-    service._create_imported_roster_agent_app = Mock(return_value=roster_result)
-    service._create_imported_inline_agent = Mock(return_value=inline_result)
+    imported_results = [
+        SimpleNamespace(
+            agent=SimpleNamespace(id=f"inline-agent-{index}"),
+            snapshot=SimpleNamespace(id=f"inline-snapshot-{index}"),
+            warnings=[DslImportWarning(code=f"inline-{index}", path="agent", message="inline warning")],
+        )
+        for index in range(1, 4)
+    ]
+    service._create_imported_inline_agent = Mock(side_effect=imported_results)
     workflow = SimpleNamespace(
         tenant_id="tenant-1",
         app_id="app-1",
@@ -379,15 +412,25 @@ def test_import_workflow_packages_replaces_bindings_and_reuses_roster_package()
     )
 
     session.delete.assert_called_once_with(old_binding)
-    service._create_imported_roster_agent_app.assert_called_once()
-    service._create_imported_inline_agent.assert_called_once()
-    assert [warning.code for warning in warnings] == ["roster", "roster", "inline"]
-    assert result["nodes"][0]["data"]["agent_binding"]["agent_id"] == "roster-agent"
-    assert result["nodes"][2]["data"]["agent_binding"]["agent_id"] == "inline-agent"
+    assert service._create_imported_inline_agent.call_count == 3
+    assert [call.kwargs["node_id"] for call in service._create_imported_inline_agent.call_args_list] == [
+        "roster-1",
+        "roster-2",
+        "inline",
+    ]
+    assert [warning.code for warning in warnings] == ["inline-1", "inline-2", "inline-3"]
+    bindings = [result["nodes"][index]["data"]["agent_binding"] for index in range(3)]
+    assert [binding["agent_id"] for binding in bindings] == [
+        "inline-agent-1",
+        "inline-agent-2",
+        "inline-agent-3",
+    ]
+    assert all(binding["binding_type"] == WorkflowAgentBindingType.INLINE_AGENT.value for binding in bindings)
     assert AGENT_NODE_JOB_DSL_KEY not in result["nodes"][0]["data"]
     assert json.loads(workflow.graph) == result
     added_bindings = [item.args[0] for item in session.add.call_args_list]
     assert all(isinstance(binding, WorkflowAgentNodeBinding) for binding in added_bindings)
+    assert all(binding.binding_type == WorkflowAgentBindingType.INLINE_AGENT for binding in added_bindings)
 
 
 @pytest.mark.parametrize(
@@ -509,35 +552,6 @@ def test_extract_package_dependencies_covers_model_tools_and_knowledge(monkeypat
     ]
 
 
-def test_create_imported_roster_agent_app_prefixes_warnings(monkeypatch) -> None:
-    session = Mock()
-    service = AgentDslService(session)
-    service._configure_visible_agent_app_after_commit = Mock()
-    result = SimpleNamespace(
-        agent=_agent(),
-        snapshot=_snapshot(),
-        warnings=[DslImportWarning(code="setup", path="soul.model", message="setup")],
-    )
-    service.import_agent_app_package = Mock(return_value=result)
-    send = Mock()
-    monkeypatch.setattr("services.agent.dsl_service.app_was_created.send", send)
-
-    imported = service._create_imported_roster_agent_app(
-        tenant_id="tenant-1",
-        account=SimpleNamespace(id="account-1"),
-        package=make_portable_agent_package(_agent(), AgentSoulConfig()),
-        package_path="agent_packages.agent_1",
-    )
-
-    app = session.add.call_args.args[0]
-    assert isinstance(app, App)
-    assert app.name == "Portable Agent"
-    assert app.enable_site is True
-    assert app.enable_api is True
-    send.assert_called_once_with(app, account=SimpleNamespace(id="account-1"), session=session)
-    assert imported.warnings[0].path == "agent_packages.agent_1.soul.model"
-
-
 def test_create_imported_inline_agent_uses_import_provenance() -> None:
     service = AgentDslService(Mock())
     soul = AgentSoulConfig(config_note="inline")
@@ -687,51 +701,6 @@ def test_unique_roster_name_uses_first_available_suffix() -> None:
     assert result == "Agent import 2"
 
 
-def test_configure_visible_agent_app_runs_after_commit(monkeypatch) -> None:
-    session = Mock()
-    listener = Mock()
-    monkeypatch.setattr("services.agent.dsl_service.event.listen", listener)
-    service = AgentDslService(session)
-
-    service._configure_visible_agent_app_after_commit(
-        tenant_id="tenant-1",
-        app_id="app-1",
-        account_id="account-1",
-    )
-
-    listener.assert_called_once_with(session, "after_commit", listener.call_args.args[2], once=True)
-    configure = listener.call_args.args[2]
-    from services.enterprise import rbac_service
-    from services.enterprise.enterprise_service import EnterpriseService
-    from services.feature_service import FeatureService
-
-    sync = Mock()
-    update_access = Mock()
-    monkeypatch.setattr(rbac_service, "try_sync_creator_access_policy_member_bindings", sync)
-    monkeypatch.setattr(EnterpriseService.WebAppAuth, "update_app_access_mode", update_access)
-    monkeypatch.setattr(
-        FeatureService,
-        "get_system_features",
-        Mock(return_value=SimpleNamespace(webapp_auth=SimpleNamespace(enabled=False))),
-    )
-    configure(session)
-    update_access.assert_not_called()
-
-    FeatureService.get_system_features.return_value = SimpleNamespace(webapp_auth=SimpleNamespace(enabled=True))
-    configure(session)
-    update_access.assert_called_once_with("app-1", "private")
-    assert sync.call_args_list == [
-        call("tenant-1", "account-1", rbac_service.RBACResourceType.APP, "app-1"),
-        call("tenant-1", "account-1", rbac_service.RBACResourceType.APP, "app-1"),
-    ]
-
-    monkeypatch.setattr(rbac_service, "try_sync_creator_access_policy_member_bindings", Mock(side_effect=RuntimeError))
-    logger = Mock()
-    monkeypatch.setattr("services.agent.dsl_service.logger", logger)
-    configure(session)
-    logger.exception.assert_called_once()
-
-
 def test_require_helpers_and_graph_detection() -> None:
     session = Mock()
     service = AgentDslService(session)
@@ -750,7 +719,5 @@ def test_require_helpers_and_graph_detection() -> None:
 
     assert AgentDslService._agent_icon_type(AgentIconType.EMOJI.value) == AgentIconType.EMOJI
     assert AgentDslService._agent_icon_type(None) is None
-    assert AgentDslService._app_icon_type(IconType.IMAGE.value) == IconType.IMAGE
-    assert AgentDslService._app_icon_type(None) == IconType.EMOJI
     assert is_agent_v2_graph({"nodes": [_agent_node("agent")]}) is True
     assert is_agent_v2_graph({"nodes": ["invalid", {"data": {"type": "start"}}]}) is False

api/tests/unit_tests/services/plugin/test_plugin_parameter_service.py

@@ -1,4 +1,4 @@
-"""Tests for services.plugin.plugin_parameter_service.PluginParameterService.
+"""Unit tests for services.plugin.plugin_parameter_service.PluginParameterService.
 
 Covers: dynamic select options via tool and trigger credential paths,
 HIDDEN_VALUE replacement, and error handling for missing records.
@@ -7,17 +7,33 @@ HIDDEN_VALUE replacement, and error handling for missing records.
 from __future__ import annotations
 
 import json
+from collections.abc import Iterator
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
 from flask import Flask
+from sqlalchemy.orm import Session
 
 from core.plugin.entities.plugin_daemon import CredentialType
+from models.engine import db
 from models.tools import BuiltinToolProvider
 from services.plugin.plugin_parameter_service import PluginParameterService
 
 
+@pytest.fixture
+def plugin_parameter_db() -> Iterator[Session]:
+    """Provide the production database extension with an isolated SQLite credential table."""
+    app = Flask(__name__)
+    app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
+    db.init_app(app)
+
+    with app.app_context():
+        BuiltinToolProvider.__table__.create(db.engine)
+        with Session(db.engine, expire_on_commit=False) as session:
+            yield session
+
+
 class TestGetDynamicSelectOptionsTool:
     @patch("services.plugin.plugin_parameter_service.DynamicSelectClient")
     @patch("services.plugin.plugin_parameter_service.ToolManager")
@@ -50,9 +66,8 @@ class TestGetDynamicSelectOptionsTool:
         mock_tool_mgr: MagicMock,
         mock_encrypter_fn: MagicMock,
         mock_client_cls,
-        flask_app_with_containers: Flask,
-        db_session_with_containers: Session,
-    ):
+        plugin_parameter_db: Session,
+    ) -> None:
         tenant_id = str(uuid4())
         provider_ctrl = MagicMock()
         provider_ctrl.need_credentials = True
@@ -70,8 +85,8 @@ class TestGetDynamicSelectOptionsTool:
             encrypted_credentials=json.dumps({"api_key": "encrypted"}),
             credential_type=CredentialType.API_KEY,
         )
-        db_session_with_containers.add(db_record)
-        db_session_with_containers.commit()
+        plugin_parameter_db.add(db_record)
+        plugin_parameter_db.commit()
 
         result = PluginParameterService.get_dynamic_select_options(
             tenant_id=tenant_id,
@@ -92,9 +107,8 @@ class TestGetDynamicSelectOptionsTool:
         self,
         mock_tool_mgr: MagicMock,
         mock_encrypter_fn: MagicMock,
-        flask_app_with_containers: Flask,
-        db_session_with_containers: Session,
-    ):
+        plugin_parameter_db: Session,
+    ) -> None:
         provider_ctrl = MagicMock()
         provider_ctrl.need_credentials = True
         mock_tool_mgr.get_builtin_provider.return_value = provider_ctrl

api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_customized_retrieval.py

@@ -1,33 +1,66 @@
 from types import SimpleNamespace
 
-from pytest_mock import MockerFixture
+import pytest
+from sqlalchemy.orm import Session
 
+from models.account import Account
+from models.dataset import PipelineCustomizedTemplate
 from services.rag_pipeline.pipeline_template.customized.customized_retrieval import CustomizedPipelineTemplateRetrieval
 from services.rag_pipeline.pipeline_template.pipeline_template_type import PipelineTemplateType
 
+TENANT_ID = "11111111-1111-1111-1111-111111111111"
+OTHER_TENANT_ID = "22222222-2222-2222-2222-222222222222"
+CREATOR_ID = "33333333-3333-3333-3333-333333333333"
+TEMPLATE_ID = "44444444-4444-4444-4444-444444444444"
 
-def test_get_pipeline_templates(mocker: MockerFixture) -> None:
-    customized_template = SimpleNamespace(
-        id="tpl-1",
-        name="Custom Template",
+
+def _template(
+    *,
+    template_id: str = TEMPLATE_ID,
+    tenant_id: str = TENANT_ID,
+    language: str = "en-US",
+    name: str = "Custom Template",
+) -> PipelineCustomizedTemplate:
+    template = PipelineCustomizedTemplate(
+        tenant_id=tenant_id,
+        name=name,
         description="desc",
         icon={"background": "#fff"},
         position=2,
         chunk_structure="parent-child",
+        yaml_content="workflow:\n  graph:\n    edges: []",
+        install_count=0,
+        language=language,
+        created_by=CREATOR_ID,
     )
-    scalars_mock = mocker.Mock()
-    scalars_mock.all.return_value = [customized_template]
-    session_mock = mocker.Mock()
-    session_mock.scalars.return_value = scalars_mock
+    template.id = template_id
+    return template
+
+
+@pytest.mark.parametrize("sqlite_session", [(PipelineCustomizedTemplate,)], indirect=True)
+def test_get_pipeline_templates(sqlite_session: Session) -> None:
+    target = _template()
+    wrong_language = _template(
+        template_id="55555555-5555-5555-5555-555555555555",
+        language="zh-Hans",
+        name="Wrong Language",
+    )
+    other_tenant = _template(
+        template_id="66666666-6666-6666-6666-666666666666",
+        tenant_id=OTHER_TENANT_ID,
+        name="Other Tenant",
+    )
+    sqlite_session.add_all([target, wrong_language, other_tenant])
+    sqlite_session.commit()
     retrieval = CustomizedPipelineTemplateRetrieval()
 
-    result = retrieval.get_pipeline_templates("en-US", "tenant-id", session=session_mock)
+    result = retrieval.get_pipeline_templates("en-US", TENANT_ID, session=sqlite_session)
 
     assert retrieval.get_type() == PipelineTemplateType.CUSTOMIZED
     assert result == {
         "pipeline_templates": [
             {
-                "id": "tpl-1",
+                "id": TEMPLATE_ID,
                 "name": "Custom Template",
                 "description": "desc",
                 "icon": {"background": "#fff"},
@@ -36,25 +69,22 @@ def test_get_pipeline_templates(mocker: MockerFixture) -> None:
             }
         ]
     }
+    assert sqlite_session.in_transaction()
 
 
-def test_get_pipeline_template_detail_returns_detail(mocker: MockerFixture) -> None:
-    session_mock = mocker.Mock()
-    session_mock.get.return_value = SimpleNamespace(
-        id="tpl-1",
-        name="Custom Template",
-        icon={"background": "#fff"},
-        description="desc",
-        chunk_structure="parent-child",
-        yaml_content="workflow:\n  graph:\n    edges: []",
-        created_user_name="creator",
-    )
+@pytest.mark.parametrize("sqlite_session", [(Account, PipelineCustomizedTemplate)], indirect=True)
+def test_get_pipeline_template_detail_returns_detail(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session) -> None:
+    creator = Account(name="creator", email="[email protected]")
+    creator.id = CREATOR_ID
+    sqlite_session.add_all([creator, _template()])
+    sqlite_session.commit()
+    monkeypatch.setattr("models.dataset.db", SimpleNamespace(session=sqlite_session))
     retrieval = CustomizedPipelineTemplateRetrieval()
 
-    detail = retrieval.get_pipeline_template_detail("tpl-1", session=session_mock)
+    detail = retrieval.get_pipeline_template_detail(TEMPLATE_ID, session=sqlite_session)
 
     assert detail == {
-        "id": "tpl-1",
+        "id": TEMPLATE_ID,
         "name": "Custom Template",
         "icon_info": {"background": "#fff"},
         "description": "desc",
@@ -63,13 +93,14 @@ def test_get_pipeline_template_detail_returns_detail(mocker: MockerFixture) -> N
         "graph": {"edges": []},
         "created_by": "creator",
     }
+    assert sqlite_session.in_transaction()
 
 
-def test_get_pipeline_template_detail_returns_none_when_not_found(mocker: MockerFixture) -> None:
-    session_mock = mocker.Mock()
-    session_mock.get.return_value = None
+@pytest.mark.parametrize("sqlite_session", [(PipelineCustomizedTemplate,)], indirect=True)
+def test_get_pipeline_template_detail_returns_none_when_not_found(sqlite_session: Session) -> None:
     retrieval = CustomizedPipelineTemplateRetrieval()
 
-    result = retrieval.get_pipeline_template_detail("missing", session=session_mock)
+    result = retrieval.get_pipeline_template_detail(TEMPLATE_ID, session=sqlite_session)
 
     assert result is None
+    assert sqlite_session.in_transaction()

api/tests/unit_tests/services/rag_pipeline/pipeline_template/test_remote_retrieval.py

@@ -1,12 +1,14 @@
 import pytest
 from pytest_mock import MockerFixture
+from sqlalchemy.orm import Session
 
 from services.rag_pipeline.pipeline_template.database.database_retrieval import DatabasePipelineTemplateRetrieval
 from services.rag_pipeline.pipeline_template.pipeline_template_type import PipelineTemplateType
 from services.rag_pipeline.pipeline_template.remote.remote_retrieval import RemotePipelineTemplateRetrieval
 
 
-def test_get_pipeline_templates_fallbacks_to_database_on_error(mocker: MockerFixture) -> None:
+@pytest.mark.parametrize("sqlite_session", [()], indirect=True)
+def test_get_pipeline_templates_fallbacks_to_database_on_error(mocker: MockerFixture, sqlite_session: Session) -> None:
     fetch_mock = mocker.patch.object(
         RemotePipelineTemplateRetrieval,
         "fetch_pipeline_templates_from_dify_official",
@@ -18,17 +20,20 @@ def test_get_pipeline_templates_fallbacks_to_database_on_error(mocker: MockerFix
         return_value={"pipeline_templates": [{"id": "db-1"}]},
     )
     retrieval = RemotePipelineTemplateRetrieval()
-    session = mocker.Mock()
 
-    result = retrieval.get_pipeline_templates("en-US", session=session)
+    result = retrieval.get_pipeline_templates("en-US", session=sqlite_session)
 
     assert retrieval.get_type() == PipelineTemplateType.REMOTE
     assert result == {"pipeline_templates": [{"id": "db-1"}]}
     fetch_mock.assert_called_once_with("en-US")
-    fallback_mock.assert_called_once_with("en-US", session=session)
+    fallback_mock.assert_called_once_with("en-US", session=sqlite_session)
+    assert not sqlite_session.in_transaction()
 
 
-def test_get_pipeline_template_detail_fallbacks_to_database_on_error(mocker: MockerFixture) -> None:
+@pytest.mark.parametrize("sqlite_session", [()], indirect=True)
+def test_get_pipeline_template_detail_fallbacks_to_database_on_error(
+    mocker: MockerFixture, sqlite_session: Session
+) -> None:
     fetch_mock = mocker.patch.object(
         RemotePipelineTemplateRetrieval,
         "fetch_pipeline_template_detail_from_dify_official",
@@ -40,13 +45,13 @@ def test_get_pipeline_template_detail_fallbacks_to_database_on_error(mocker: Moc
         return_value={"id": "db-1"},
     )
     retrieval = RemotePipelineTemplateRetrieval()
-    session = mocker.Mock()
 
-    result = retrieval.get_pipeline_template_detail("tpl-1", session=session)
+    result = retrieval.get_pipeline_template_detail("tpl-1", session=sqlite_session)
 
     assert result == {"id": "db-1"}
     fetch_mock.assert_called_once_with("tpl-1")
-    fallback_mock.assert_called_once_with("tpl-1", session=session)
+    fallback_mock.assert_called_once_with("tpl-1", session=sqlite_session)
+    assert not sqlite_session.in_transaction()
 
 
 def test_fetch_pipeline_templates_from_dify_official(mocker: MockerFixture) -> None:

api/tests/unit_tests/services/test_account_service.py

@@ -1008,7 +1008,7 @@ class TestTenantService:
         assert target_join.role == TenantAccountRole.ADMIN
 
     @pytest.mark.parametrize("sqlite_session", [(TenantAccountJoin,)], indirect=True)
-    def test_create_owner_tenant_if_not_exist_rbac_enabled_assigns_owner_role(
+    def test_create_owner_tenant_rbac_enabled_assigns_owner_role(
         self, sqlite_session: Session, mock_external_service_dependencies
     ):
         mock_account = TestAccountAssociatedDataFactory.create_account_mock(account_id="user-rbac", name="RBAC User")
@@ -1034,7 +1034,7 @@ class TestTenantService:
             patch("services.account_service.RBACService") as mock_rbac_service,
             patch("services.account_service.tenant_was_created.send"),
         ):
-            TenantService.create_owner_tenant_if_not_exist(mock_account, is_setup=True, session=sqlite_session)
+            TenantService.create_owner_tenant(mock_account, is_setup=True, session=sqlite_session)
 
         mock_rbac_service.MemberRoles.replace.assert_called_once_with(
             tenant_id="tenant-rbac",
@@ -1476,16 +1476,9 @@ class TestRegisterService:
         with patch("services.account_service.AccountService.create_account") as mock_create_account:
             mock_create_account.return_value = mock_account
 
-            # Mock TenantService.create_tenant and create_tenant_member
             with (
-                patch("services.account_service.TenantService.create_tenant") as mock_create_tenant,
-                patch("services.account_service.TenantService.create_tenant_member") as mock_create_member,
-                patch("services.account_service.tenant_was_created") as mock_event,
+                patch("services.account_service.TenantService.create_owner_tenant") as mock_create_owner_tenant,
             ):
-                mock_tenant = MagicMock()
-                mock_tenant.id = "tenant-456"
-                mock_create_tenant.return_value = mock_tenant
-
                 # Execute test
                 result = RegisterService.register(
                     email="[email protected]",
@@ -1508,9 +1501,7 @@ class TestRegisterService:
                     timezone=None,
                     session=sqlite_session,
                 )
-                mock_create_tenant.assert_called_once_with("Test User's Workspace", session=sqlite_session)
-                mock_create_member.assert_called_once_with(mock_tenant, mock_account, sqlite_session, role="owner")
-                mock_event.send.assert_called_once_with(mock_tenant)
+                mock_create_owner_tenant.assert_called_once_with(mock_account, session=sqlite_session)
 
     def test_register_calls_default_workspace_join_when_enterprise_enabled(
         self, sqlite_session: Session, mock_external_service_dependencies, monkeypatch: pytest.MonkeyPatch

api/tests/unit_tests/services/test_billing_service.py

@@ -465,11 +465,17 @@ class TestBillingServiceSubscriptionInfo:
     def test_quota_get_balance_uses_quota_request(self):
         tenant_id = "tenant-123"
         with patch.object(BillingService, "_send_quota_request") as mock_send_quota_request:
-            mock_send_quota_request.return_value = {"quota": "200", "usage": "6", "available": "194", "reserved": "0"}
+            mock_send_quota_request.return_value = {
+                "quota": "200",
+                "usage": "6",
+                "available": "194",
+                "reserved": "0",
+                "exhausted_at": "1748908800",
+            }
 
             result = BillingService.quota_get_balance(tenant_id, "credit_pool", bucket="trial")
 
-        assert result == {"quota": 200, "usage": 6, "available": 194, "reserved": 0}
+        assert result == {"quota": 200, "usage": 6, "available": 194, "reserved": 0, "exhausted_at": 1748908800}
         mock_send_quota_request.assert_called_once_with(
             "GET",
             "/quota/balance",

api/tests/unit_tests/services/test_credit_pool_service.py

@@ -265,13 +265,20 @@ def test_get_pool_uses_billing_quota_balance_when_enabled() -> None:
         patch("services.credit_pool_service.dify_config.BILLING_ENABLED", True),
         patch("services.billing_service.BillingService.quota_get_balance") as quota_get_balance,
     ):
-        quota_get_balance.return_value = {"quota": 1000, "usage": 250, "available": 750, "reserved": 0}
+        quota_get_balance.return_value = {
+            "quota": 1000,
+            "usage": 250,
+            "available": 750,
+            "reserved": 0,
+            "exhausted_at": 1748908800,
+        }
 
         pool = CreditPoolService.get_pool(tenant_id=tenant_id, pool_type=ProviderQuotaType.PAID)
 
     assert isinstance(pool, CreditPoolBalance)
     assert pool.quota_limit == 1000
     assert pool.quota_used == 250
+    assert pool.exhausted_at == 1748908800
     assert pool.remaining_credits == 750
     quota_get_balance.assert_called_once_with(
         tenant_id=tenant_id,

api/tests/unit_tests/services/test_file_service.py

@@ -84,6 +84,27 @@ class TestFileService:
         mock_db_session.add.assert_called_once_with(result)
         mock_db_session.commit.assert_called_once()
 
+    def test_upload_file_uses_explicit_resource_tenant(self, file_service: FileService):
+        user = MagicMock(spec=Account)
+        user.id = "user-id"
+
+        with (
+            patch("services.file_service.storage") as mock_storage,
+            patch("services.file_service.extract_tenant_id") as mock_extract_tenant_id,
+            patch("services.file_service.file_helpers.get_signed_file_url"),
+        ):
+            result = file_service.upload_file(
+                filename="test.txt",
+                content=b"test",
+                mimetype="text/plain",
+                user=user,
+                tenant_id="resource-tenant-id",
+            )
+
+        assert result.tenant_id == "resource-tenant-id"
+        assert mock_storage.save.call_args.args[0].startswith("upload_files/resource-tenant-id/")
+        mock_extract_tenant_id.assert_not_called()
+
     def test_upload_file_invalid_characters(self, file_service):
         with pytest.raises(ValueError, match="Filename contains invalid characters"):
             file_service.upload_file(filename="invalid/file.txt", content=b"", mimetype="text/plain", user=MagicMock())

api/tests/unit_tests/services/test_knowledge_retrieval_inner_service.py

@@ -3,8 +3,12 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from sqlalchemy.orm import Session
 
 from core.workflow.nodes.knowledge_retrieval.retrieval import Source, SourceMetadata
+from models.dataset import Dataset
+from models.enums import AppStatus
+from models.model import App, AppMode
 from services.entities.knowledge_retrieval_inner import InnerKnowledgeRetrieveRequest
 from services.errors.knowledge_retrieval import (
     InnerKnowledgeRetrieveAppNotFoundError,
@@ -14,17 +18,55 @@ from services.errors.knowledge_retrieval import (
 )
 from services.knowledge_retrieval_inner_service import InnerKnowledgeRetrievalService
 
+TENANT_ID = "11111111-1111-1111-1111-111111111111"
+OTHER_TENANT_ID = "22222222-2222-2222-2222-222222222222"
+USER_ID = "33333333-3333-3333-3333-333333333333"
+APP_ID = "44444444-4444-4444-4444-444444444444"
+DATASET_1_ID = "55555555-5555-5555-5555-555555555555"
+DATASET_2_ID = "66666666-6666-6666-6666-666666666666"
+
+
+def _app(*, tenant_id: str = TENANT_ID) -> App:
+    return App(
+        id=APP_ID,
+        tenant_id=tenant_id,
+        name="Test App",
+        description="",
+        mode=AppMode.WORKFLOW,
+        status=AppStatus.NORMAL,
+        enable_site=False,
+        enable_api=False,
+        max_active_requests=None,
+    )
+
+
+def _dataset(*, dataset_id: str, tenant_id: str = TENANT_ID, enable_api: bool = True) -> Dataset:
+    return Dataset(
+        id=dataset_id,
+        tenant_id=tenant_id,
+        name=f"Dataset {dataset_id[-1]}",
+        description="",
+        created_by=USER_ID,
+        enable_api=enable_api,
+    )
+
+
+def _persist_state(sqlite_session: Session, *models: App | Dataset) -> None:
+    sqlite_session.add_all(models)
+    sqlite_session.commit()
+    sqlite_session.expunge_all()
+
 
 def _build_request(**overrides):
     payload = {
         "caller": {
-            "tenant_id": "tenant-1",
-            "user_id": "user-1",
-            "app_id": "app-1",
+            "tenant_id": TENANT_ID,
+            "user_id": USER_ID,
+            "app_id": APP_ID,
             "user_from": "account",
             "invoke_from": "workflow",
         },
-        "dataset_ids": ["dataset-1", "dataset-2"],
+        "dataset_ids": [DATASET_1_ID, DATASET_2_ID],
         "query": "how to reset password",
         "retrieval": {
             "mode": "multiple",
@@ -73,15 +115,20 @@ def _build_source() -> Source:
 
 
 class TestInnerKnowledgeRetrievalService:
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
     @patch("services.knowledge_retrieval_inner_service.DatasetRetrieval")
-    def test_retrieve_maps_multiple_request_and_skips_enable_api_check(self, mock_rag_cls):
+    def test_retrieve_maps_multiple_request_and_skips_enable_api_check(
+        self,
+        mock_rag_cls,
+        sqlite_session: Session,
+    ):
         request = _build_request()
-        mock_session = MagicMock()
-        mock_app = MagicMock(id="app-1", tenant_id="tenant-1")
-        dataset_1 = MagicMock(id="dataset-1", tenant_id="tenant-1", enable_api=False)
-        dataset_2 = MagicMock(id="dataset-2", tenant_id="tenant-1", enable_api=True)
-        mock_session.scalar.return_value = mock_app
-        mock_session.scalars.return_value.all.return_value = [dataset_1, dataset_2]
+        _persist_state(
+            sqlite_session,
+            _app(),
+            _dataset(dataset_id=DATASET_1_ID, enable_api=False),
+            _dataset(dataset_id=DATASET_2_ID, enable_api=True),
+        )
 
         rag = MagicMock()
         rag.knowledge_retrieval.return_value = [_build_source()]
@@ -103,13 +150,13 @@ class TestInnerKnowledgeRetrievalService:
         }
         mock_rag_cls.return_value = rag
 
-        response = InnerKnowledgeRetrievalService().retrieve(request, mock_session)
+        response = InnerKnowledgeRetrievalService().retrieve(request, sqlite_session)
 
         rag_request = rag.knowledge_retrieval.call_args.kwargs["request"]
-        assert rag_request.tenant_id == "tenant-1"
-        assert rag_request.app_id == "app-1"
-        assert rag_request.user_id == "user-1"
-        assert rag_request.dataset_ids == ["dataset-1", "dataset-2"]
+        assert rag_request.tenant_id == TENANT_ID
+        assert rag_request.app_id == APP_ID
+        assert rag_request.user_id == USER_ID
+        assert rag_request.dataset_ids == [DATASET_1_ID, DATASET_2_ID]
         assert rag_request.query == "how to reset password"
         assert rag_request.retrieval_mode == "multiple"
         assert rag_request.top_k == 4
@@ -127,11 +174,14 @@ class TestInnerKnowledgeRetrievalService:
         assert rag_request.attachment_ids == ["attachment-1"]
         assert response.results[0].title == "FAQ.md"
         assert response.usage.currency == "USD"
+        assert rag.knowledge_retrieval.call_args.kwargs["session"] is sqlite_session
+        assert sqlite_session.in_transaction()
 
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
     @patch("services.knowledge_retrieval_inner_service.DatasetRetrieval")
-    def test_retrieve_maps_single_request(self, mock_rag_cls):
+    def test_retrieve_maps_single_request(self, mock_rag_cls, sqlite_session: Session):
         request = _build_request(
-            dataset_ids=["dataset-1"],
+            dataset_ids=[DATASET_1_ID],
             retrieval={
                 "mode": "single",
                 "model": {
@@ -152,9 +202,7 @@ class TestInnerKnowledgeRetrievalService:
             },
             attachment_ids=[],
         )
-        mock_session = MagicMock()
-        mock_session.scalar.return_value = MagicMock(id="app-1", tenant_id="tenant-1")
-        mock_session.scalars.return_value.all.return_value = [MagicMock(id="dataset-1", tenant_id="tenant-1")]
+        _persist_state(sqlite_session, _app(), _dataset(dataset_id=DATASET_1_ID))
 
         rag = MagicMock()
         rag.knowledge_retrieval.return_value = []
@@ -174,7 +222,7 @@ class TestInnerKnowledgeRetrievalService:
         }
         mock_rag_cls.return_value = rag
 
-        InnerKnowledgeRetrievalService().retrieve(request, mock_session)
+        InnerKnowledgeRetrievalService().retrieve(request, sqlite_session)
 
         rag_request = rag.knowledge_retrieval.call_args.kwargs["request"]
         assert rag_request.retrieval_mode == "single"
@@ -185,36 +233,39 @@ class TestInnerKnowledgeRetrievalService:
         assert rag_request.metadata_filtering_mode == "automatic"
         assert rag_request.metadata_model_config is not None
         assert rag_request.metadata_model_config.provider == "openai"
+        assert sqlite_session.in_transaction()
 
-    def test_retrieve_raises_when_app_missing(self):
-        mock_session = MagicMock()
-        mock_session.scalar.return_value = None
-
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
+    def test_retrieve_raises_when_app_missing(self, sqlite_session: Session):
         with pytest.raises(InnerKnowledgeRetrieveAppNotFoundError):
-            InnerKnowledgeRetrievalService().retrieve(_build_request(), mock_session)
+            InnerKnowledgeRetrievalService().retrieve(_build_request(), sqlite_session)
+        assert sqlite_session.in_transaction()
 
-    def test_retrieve_raises_when_app_belongs_to_other_tenant(self):
-        mock_session = MagicMock()
-        mock_session.scalar.return_value = MagicMock(id="app-1", tenant_id="tenant-2")
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
+    def test_retrieve_raises_when_app_belongs_to_other_tenant(self, sqlite_session: Session):
+        _persist_state(sqlite_session, _app(tenant_id=OTHER_TENANT_ID))
 
         with pytest.raises(InnerKnowledgeRetrieveAppTenantMismatchError):
-            InnerKnowledgeRetrievalService().retrieve(_build_request(), mock_session)
+            InnerKnowledgeRetrievalService().retrieve(_build_request(), sqlite_session)
+        assert sqlite_session.in_transaction()
 
-    def test_retrieve_raises_when_dataset_missing(self):
-        mock_session = MagicMock()
-        mock_session.scalar.return_value = MagicMock(id="app-1", tenant_id="tenant-1")
-        mock_session.scalars.return_value.all.return_value = [MagicMock(id="dataset-1", tenant_id="tenant-1")]
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
+    def test_retrieve_raises_when_dataset_missing(self, sqlite_session: Session):
+        _persist_state(sqlite_session, _app(), _dataset(dataset_id=DATASET_1_ID))
 
         with pytest.raises(InnerKnowledgeRetrieveDatasetNotFoundError):
-            InnerKnowledgeRetrievalService().retrieve(_build_request(), mock_session)
+            InnerKnowledgeRetrievalService().retrieve(_build_request(), sqlite_session)
+        assert sqlite_session.in_transaction()
 
-    def test_retrieve_raises_when_dataset_belongs_to_other_tenant(self):
-        mock_session = MagicMock()
-        mock_session.scalar.return_value = MagicMock(id="app-1", tenant_id="tenant-1")
-        mock_session.scalars.return_value.all.return_value = [
-            MagicMock(id="dataset-1", tenant_id="tenant-1"),
-            MagicMock(id="dataset-2", tenant_id="tenant-2"),
-        ]
+    @pytest.mark.parametrize("sqlite_session", [(App, Dataset)], indirect=True)
+    def test_retrieve_raises_when_dataset_belongs_to_other_tenant(self, sqlite_session: Session):
+        _persist_state(
+            sqlite_session,
+            _app(),
+            _dataset(dataset_id=DATASET_1_ID),
+            _dataset(dataset_id=DATASET_2_ID, tenant_id=OTHER_TENANT_ID),
+        )
 
         with pytest.raises(InnerKnowledgeRetrieveDatasetTenantMismatchError):
-            InnerKnowledgeRetrievalService().retrieve(_build_request(), mock_session)
+            InnerKnowledgeRetrievalService().retrieve(_build_request(), sqlite_session)
+        assert sqlite_session.in_transaction()

api/tests/unit_tests/services/test_workflow_generator_service.py

@@ -200,24 +200,21 @@ class TestWorkflowGeneratorService:
         call_kwargs = mock_workflow_generator.generate_workflow_graph.call_args.kwargs
         assert call_kwargs["current_graph"] is None
 
-    @patch("services.workflow_generator_service.LLMGenerator")
     @patch("services.workflow_generator_service.WorkflowGenerator")
     @patch("services.workflow_generator_service.ModelManager")
     @patch("services.workflow_generator_service.build_tool_catalogue")
     @patch("services.workflow_generator_service.format_tool_catalogue")
-    def test_auto_mode_resolves_via_classifier(
+    def test_auto_mode_forwards_sentinel_to_runner(
         self,
         mock_format_catalogue: MagicMock,
         mock_build_catalogue: MagicMock,
         mock_model_manager: MagicMock,
         mock_workflow_generator: MagicMock,
-        mock_llm_generator: MagicMock,
     ):
-        """Task 3: ``mode="auto"`` is classified before planning; the concrete mode reaches the runner."""
+        """``mode="auto"`` passes straight through — the planner resolves it, no extra LLM call."""
         mock_model_manager.for_tenant.return_value.get_model_instance.return_value = MagicMock()
         mock_build_catalogue.return_value = []
         mock_format_catalogue.return_value = ""
-        mock_llm_generator.classify_workflow_mode.return_value = "workflow"
         mock_workflow_generator.generate_workflow_graph.return_value = {
             "graph": {"nodes": [], "edges": [], "viewport": {"x": 0, "y": 0, "zoom": 0.7}},
             "message": "",
@@ -231,26 +228,22 @@ class TestWorkflowGeneratorService:
             model_config=_model_config(),
         )
 
-        mock_llm_generator.classify_workflow_mode.assert_called_once()
-        classify_kwargs = mock_llm_generator.classify_workflow_mode.call_args.kwargs
-        assert classify_kwargs["tenant_id"] == "t-1"
-        assert classify_kwargs["instruction"] == "Summarize a URL"
-        assert mock_workflow_generator.generate_workflow_graph.call_args.kwargs["mode"] == "workflow"
+        assert mock_workflow_generator.generate_workflow_graph.call_args.kwargs["mode"] == "auto"
+        # the model registry is consulted exactly once — no classifier resolution
+        mock_model_manager.for_tenant.return_value.get_model_instance.assert_called_once()
 
-    @patch("services.workflow_generator_service.LLMGenerator")
     @patch("services.workflow_generator_service.WorkflowGenerator")
     @patch("services.workflow_generator_service.ModelManager")
     @patch("services.workflow_generator_service.build_tool_catalogue")
     @patch("services.workflow_generator_service.format_tool_catalogue")
-    def test_explicit_mode_skips_classifier(
+    def test_explicit_mode_passes_through_unchanged(
         self,
         mock_format_catalogue: MagicMock,
         mock_build_catalogue: MagicMock,
         mock_model_manager: MagicMock,
         mock_workflow_generator: MagicMock,
-        mock_llm_generator: MagicMock,
     ):
-        """A concrete mode passes through unchanged without an extra classification call."""
+        """A concrete mode reaches the runner verbatim."""
         mock_model_manager.for_tenant.return_value.get_model_instance.return_value = MagicMock()
         mock_build_catalogue.return_value = []
         mock_format_catalogue.return_value = ""
@@ -267,7 +260,6 @@ class TestWorkflowGeneratorService:
             model_config=_model_config(),
         )
 
-        mock_llm_generator.classify_workflow_mode.assert_not_called()
         assert mock_workflow_generator.generate_workflow_graph.call_args.kwargs["mode"] == "advanced-chat"
 
     @patch("services.workflow_generator_service.WorkflowGenerator")

api/tests/unit_tests/tasks/test_document_indexing_sync_task.py

@@ -1,20 +1,28 @@
-"""
-Unit tests for collaborator parameter wiring in document_indexing_sync_task.
+"""Unit tests for document sync persistence and external collaborator wiring.
 
-These tests intentionally stay in unit scope because they validate call arguments
-for external collaborators rather than SQL-backed state transitions.
+The task's Dataset and Document lookups use real SQLite transactions. Datasource,
+Notion extraction, index cleanup, and indexing remain mocked I/O boundaries.
 """
 
 import json
 import uuid
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, patch
 
 import pytest
+from sqlalchemy.orm import Session, sessionmaker
 
+from core.db import session_factory as session_factory_module
 from core.rag.index_processor.constant.index_type import IndexStructureType
-from models.dataset import Dataset, Document
+from models.dataset import Dataset, Document, DocumentSegment
+from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
 from tasks.document_indexing_sync_task import document_indexing_sync_task
 
+pytestmark = pytest.mark.parametrize(
+    "sqlite_session",
+    [(Dataset, Document, DocumentSegment)],
+    indirect=True,
+)
+
 
 @pytest.fixture
 def dataset_id() -> str:
@@ -47,52 +55,72 @@ def credential_id() -> str:
 
 
 @pytest.fixture
-def mock_dataset(dataset_id):
-    """Create a minimal dataset mock used by the task pre-check."""
-    dataset = Mock(spec=Dataset)
-    dataset.id = dataset_id
+def tenant_id() -> str:
+    """Generate the tenant that owns the persisted dataset and document."""
+    return str(uuid.uuid4())
+
+
+@pytest.fixture
+def dataset(sqlite_session: Session, dataset_id: str, tenant_id: str) -> Dataset:
+    """Persist the dataset resolved by the task's initial and cleanup transactions."""
+    dataset = Dataset(
+        id=dataset_id,
+        tenant_id=tenant_id,
+        name="Notion dataset",
+        data_source_type=DataSourceType.NOTION_IMPORT,
+        created_by=str(uuid.uuid4()),
+    )
+    sqlite_session.add(dataset)
+    sqlite_session.commit()
     return dataset
 
 
 @pytest.fixture
-def mock_document(document_id, dataset_id, notion_workspace_id, notion_page_id, credential_id):
-    """Create a minimal notion document mock for collaborator parameter assertions."""
-    document = Mock(spec=Document)
-    document.id = document_id
-    document.dataset_id = dataset_id
-    document.tenant_id = str(uuid.uuid4())
-    document.data_source_type = "notion_import"
-    document.indexing_status = "completed"
-    document.doc_form = IndexStructureType.PARAGRAPH_INDEX
-    document.data_source_info_dict = {
-        "notion_workspace_id": notion_workspace_id,
-        "notion_page_id": notion_page_id,
-        "type": "page",
-        "last_edited_time": "2024-01-01T00:00:00Z",
-        "credential_id": credential_id,
-    }
+def document(
+    sqlite_session: Session,
+    dataset: Dataset,
+    document_id: str,
+    tenant_id: str,
+    notion_workspace_id: str,
+    notion_page_id: str,
+    credential_id: str,
+) -> Document:
+    """Persist a completed Notion document for collaborator and update assertions."""
+    document = Document(
+        id=document_id,
+        tenant_id=tenant_id,
+        dataset_id=dataset.id,
+        position=1,
+        data_source_type=DataSourceType.NOTION_IMPORT,
+        data_source_info=json.dumps(
+            {
+                "notion_workspace_id": notion_workspace_id,
+                "notion_page_id": notion_page_id,
+                "type": "page",
+                "last_edited_time": "2024-01-01T00:00:00Z",
+                "credential_id": credential_id,
+            }
+        ),
+        batch="batch-1",
+        name="Notion page",
+        created_from=DocumentCreatedFrom.API,
+        created_by=str(uuid.uuid4()),
+        indexing_status=IndexingStatus.COMPLETED,
+        doc_form=IndexStructureType.PARAGRAPH_INDEX,
+    )
+    sqlite_session.add(document)
+    sqlite_session.commit()
     return document
 
 
-@pytest.fixture
-def mock_db_session(mock_document, mock_dataset):
-    """Mock session_factory.create_session to drive deterministic read-only task flow."""
-    with patch("tasks.document_indexing_sync_task.session_factory", autospec=True) as mock_session_factory:
-        session = MagicMock()
-        session.scalars.return_value.all.return_value = []
-        session.scalar.side_effect = [mock_document, mock_dataset]
-
-        begin_cm = MagicMock()
-        begin_cm.__enter__.return_value = session
-        begin_cm.__exit__.return_value = False
-        session.begin.return_value = begin_cm
-
-        session_cm = MagicMock()
-        session_cm.__enter__.return_value = session
-        session_cm.__exit__.return_value = False
-
-        mock_session_factory.create_session.return_value = session_cm
-        yield session
+@pytest.fixture(autouse=True)
+def _bind_sqlite_session_factory(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session) -> None:
+    """Bind each task-owned session to the test's isolated SQLite database."""
+    monkeypatch.setattr(
+        session_factory_module,
+        "_session_maker",
+        sessionmaker(bind=sqlite_session.get_bind(), expire_on_commit=False),
+    )
 
 
 @pytest.fixture
@@ -120,10 +148,9 @@ class TestDocumentIndexingSyncTaskCollaboratorParams:
 
     def test_notion_extractor_initialized_with_correct_params(
         self,
-        mock_db_session,
         mock_datasource_provider_service,
         mock_notion_extractor,
-        mock_document,
+        document: Document,
         dataset_id: str,
         document_id: str,
         notion_workspace_id: str,
@@ -142,22 +169,21 @@ class TestDocumentIndexingSyncTaskCollaboratorParams:
             notion_obj_id=notion_page_id,
             notion_page_type="page",
             notion_access_token=expected_token,
-            tenant_id=mock_document.tenant_id,
+            tenant_id=document.tenant_id,
         )
 
     def test_datasource_credentials_requested_correctly(
         self,
-        mock_db_session,
         mock_datasource_provider_service,
         mock_notion_extractor,
-        mock_document,
+        document: Document,
         dataset_id: str,
         document_id: str,
         credential_id: str,
     ):
         """Test that datasource credentials are requested with expected identifiers."""
         # Arrange
-        expected_tenant_id = mock_document.tenant_id
+        expected_tenant_id = document.tenant_id
 
         # Act
         document_indexing_sync_task(dataset_id, document_id)
@@ -172,28 +198,31 @@ class TestDocumentIndexingSyncTaskCollaboratorParams:
 
     def test_credential_id_missing_uses_none(
         self,
-        mock_db_session,
         mock_datasource_provider_service,
         mock_notion_extractor,
-        mock_document,
+        document: Document,
+        sqlite_session: Session,
         dataset_id: str,
         document_id: str,
     ):
         """Test that missing credential_id is forwarded as None."""
         # Arrange
-        mock_document.data_source_info_dict = {
-            "notion_workspace_id": "workspace-id",
-            "notion_page_id": "page-id",
-            "type": "page",
-            "last_edited_time": "2024-01-01T00:00:00Z",
-        }
+        document.data_source_info = json.dumps(
+            {
+                "notion_workspace_id": "workspace-id",
+                "notion_page_id": "page-id",
+                "type": "page",
+                "last_edited_time": "2024-01-01T00:00:00Z",
+            }
+        )
+        sqlite_session.commit()
 
         # Act
         document_indexing_sync_task(dataset_id, document_id)
 
         # Assert
         mock_datasource_provider_service.get_datasource_credentials.assert_called_once_with(
-            tenant_id=mock_document.tenant_id,
+            tenant_id=document.tenant_id,
             credential_id=None,
             provider="notion_datasource",
             plugin_id="langgenius/notion_datasource",
@@ -210,14 +239,13 @@ class TestDataSourceInfoSerialization:
 
     def test_data_source_info_serialized_as_json_string(
         self,
-        mock_document,
-        mock_dataset,
+        document: Document,
+        sqlite_session: Session,
         dataset_id: str,
         document_id: str,
     ):
         """data_source_info must be serialized with json.dumps before DB write."""
         with (
-            patch("tasks.document_indexing_sync_task.session_factory") as mock_session_factory,
             patch("tasks.document_indexing_sync_task.DatasourceProviderService") as mock_service_class,
             patch("tasks.document_indexing_sync_task.NotionExtractor") as mock_extractor_class,
             patch("tasks.document_indexing_sync_task.IndexProcessorFactory") as mock_ipf,
@@ -239,32 +267,17 @@ class TestDataSourceInfoSerialization:
             mock_runner = MagicMock()
             mock_runner_class.return_value = mock_runner
 
-            # DB session mock — shared across all ``session_factory.create_session()`` calls.
-            session = MagicMock()
-            session.scalars.return_value.all.return_value = []
-            session.scalar.side_effect = [
-                mock_document,
-                mock_dataset,
-                mock_document,
-                mock_dataset,
-            ]
-
-            begin_cm = MagicMock()
-            begin_cm.__enter__.return_value = session
-            begin_cm.__exit__.return_value = False
-            session.begin.return_value = begin_cm
-
-            session_cm = MagicMock()
-            session_cm.__enter__.return_value = session
-            session_cm.__exit__.return_value = False
-            mock_session_factory.create_session.return_value = session_cm
-
             # Act
             document_indexing_sync_task(dataset_id, document_id)
 
             # Assert: data_source_info must be a JSON *string*, not a dict
-            assert isinstance(mock_document.data_source_info, str), (
-                f"data_source_info should be a JSON string, got {type(mock_document.data_source_info).__name__}"
+            sqlite_session.expire_all()
+            stored_document = sqlite_session.get(Document, document.id)
+            assert stored_document is not None
+            assert isinstance(stored_document.data_source_info, str), (
+                f"data_source_info should be a JSON string, got {type(stored_document.data_source_info).__name__}"
             )
-            parsed = json.loads(mock_document.data_source_info)
+            parsed = json.loads(stored_document.data_source_info)
             assert parsed["last_edited_time"] == "2024-02-01T00:00:00Z"
+            assert stored_document.indexing_status == IndexingStatus.PARSING
+            assert stored_document.processing_started_at is not None

api/tests/unit_tests/tasks/test_install_default_plugins_task.py

@@ -0,0 +1,149 @@
+import logging
+from types import SimpleNamespace
+from unittest.mock import MagicMock, call
+
+import pytest
+from celery.exceptions import Retry
+
+
+def test_install_default_plugins_task_uses_plugin_queue() -> None:
+    from tasks.install_default_plugins_task import install_default_plugins_task
+
+    assert install_default_plugins_task.queue == "plugin"
+
+
+def test_configure_default_models_task_uses_plugin_queue() -> None:
+    from tasks.install_default_plugins_task import configure_default_models_task
+
+    assert configure_default_models_task.queue == "plugin"
+
+
+def test_install_default_plugins_task_installs_latest_identifiers(monkeypatch: pytest.MonkeyPatch) -> None:
+    import tasks.install_default_plugins_task as task_module
+    from tasks.install_default_plugins_task import install_default_plugins_task
+
+    plugin_ids = ["langgenius/openai", "langgenius/gemini"]
+    plugin_identifiers = ["langgenius/openai:1.0.0@aaa", "langgenius/gemini:0.9.1@bbb"]
+    fetch = MagicMock(
+        return_value=[
+            SimpleNamespace(plugin_id=plugin_ids[1], latest_package_identifier=plugin_identifiers[1]),
+            SimpleNamespace(plugin_id=plugin_ids[0], latest_package_identifier=plugin_identifiers[0]),
+        ]
+    )
+    install = MagicMock()
+    monkeypatch.setattr(task_module.marketplace, "batch_fetch_plugin_manifests", fetch)
+    monkeypatch.setattr(task_module.PluginService, "install_from_marketplace_pkg", install)
+
+    install_default_plugins_task.run("tenant-1", plugin_ids)
+
+    fetch.assert_called_once_with(plugin_ids)
+    install.assert_called_once_with("tenant-1", plugin_identifiers)
+
+
+def test_install_default_plugins_task_skips_missing_plugins(
+    monkeypatch: pytest.MonkeyPatch,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    import tasks.install_default_plugins_task as task_module
+    from tasks.install_default_plugins_task import install_default_plugins_task
+
+    fetch = MagicMock(
+        return_value=[
+            SimpleNamespace(plugin_id="langgenius/openai", latest_package_identifier="langgenius/openai:1.0.0@aaa")
+        ]
+    )
+    install = MagicMock()
+    monkeypatch.setattr(task_module.marketplace, "batch_fetch_plugin_manifests", fetch)
+    monkeypatch.setattr(task_module.PluginService, "install_from_marketplace_pkg", install)
+
+    with caplog.at_level(logging.WARNING, logger=task_module.logger.name):
+        install_default_plugins_task.run("tenant-1", ["langgenius/openai", "missing/plugin"])
+
+    install.assert_called_once_with("tenant-1", ["langgenius/openai:1.0.0@aaa"])
+    assert "Default plugins not found in marketplace: missing/plugin" in caplog.text
+
+
+def test_install_default_plugins_task_queues_model_configuration_after_daemon_install(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    import tasks.install_default_plugins_task as task_module
+    from tasks.install_default_plugins_task import install_default_plugins_task
+
+    plugin_id = "langgenius/openai"
+    plugin_identifier = "langgenius/openai:1.0.0@aaa"
+    monkeypatch.setattr(task_module.dify_config, "NEW_USER_DEFAULT_MODELS", "llm:provider:model")
+    monkeypatch.setattr(
+        task_module.marketplace,
+        "batch_fetch_plugin_manifests",
+        MagicMock(return_value=[SimpleNamespace(plugin_id=plugin_id, latest_package_identifier=plugin_identifier)]),
+    )
+    monkeypatch.setattr(
+        task_module.PluginService,
+        "install_from_marketplace_pkg",
+        MagicMock(return_value=SimpleNamespace(all_installed=False, task_id="install-task-1")),
+    )
+    delay = MagicMock()
+    monkeypatch.setattr(task_module.configure_default_models_task, "delay", delay)
+
+    install_default_plugins_task.run("tenant-1", [plugin_id])
+
+    delay.assert_called_once_with("tenant-1", "install-task-1")
+
+
+def test_configure_default_models_task_retries_while_plugins_are_installing(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    import tasks.install_default_plugins_task as task_module
+    from tasks.install_default_plugins_task import configure_default_models_task
+
+    monkeypatch.setattr(task_module.dify_config, "NEW_USER_DEFAULT_MODELS", "llm:provider:model")
+    monkeypatch.setattr(
+        task_module.PluginService,
+        "fetch_install_task",
+        MagicMock(return_value=SimpleNamespace(status=task_module.PluginInstallTaskStatus.Running)),
+    )
+    retry = MagicMock(side_effect=Retry())
+    monkeypatch.setattr(configure_default_models_task, "retry", retry)
+
+    with pytest.raises(Retry):
+        configure_default_models_task.run("tenant-1", "install-task-1")
+
+    retry.assert_called_once_with()
+
+
+def test_configure_default_models_task_sets_each_explicit_model(monkeypatch: pytest.MonkeyPatch) -> None:
+    import tasks.install_default_plugins_task as task_module
+    from tasks.install_default_plugins_task import configure_default_models_task
+
+    monkeypatch.setattr(
+        task_module.dify_config,
+        "NEW_USER_DEFAULT_MODELS",
+        ("llm:langgenius/openai/openai:gpt-4o-mini,text-embedding:langgenius/openai/openai:text-embedding-3-small"),
+    )
+    fetch_install_task = MagicMock(
+        return_value=SimpleNamespace(
+            status=task_module.PluginInstallTaskStatus.Success,
+            plugins=[],
+        )
+    )
+    monkeypatch.setattr(task_module.PluginService, "fetch_install_task", fetch_install_task)
+    model_provider_service = MagicMock()
+    monkeypatch.setattr(task_module, "ModelProviderService", MagicMock(return_value=model_provider_service))
+
+    configure_default_models_task.run("tenant-1", "install-task-1")
+
+    fetch_install_task.assert_called_once_with("tenant-1", "install-task-1")
+    assert model_provider_service.update_default_model_of_model_type.call_args_list == [
+        call(
+            tenant_id="tenant-1",
+            model_type="llm",
+            provider="langgenius/openai/openai",
+            model="gpt-4o-mini",
+        ),
+        call(
+            tenant_id="tenant-1",
+            model_type="text-embedding",
+            provider="langgenius/openai/openai",
+            model="text-embedding-3-small",
+        ),
+    ]