refactor(cli): split release scripts into pure rules and CLI shells

The release script tests could only observe behaviour through a process
exit code, because die() called process.exit from inside otherwise-pure
functions. That forced every test to spawn a subprocess, which forced
its input to come from cli/package.json, which is why editing that file
kept breaking tests — most recently #39658, and next the difyctl version
bump that cli-release.yml requires on every release.

Move the decisions into lib/release-rules.mjs and lib/edge-manifest.mjs,
which take every input as an argument and return values instead of
exiting. release-naming.mjs and release-r2-edge.mjs keep argv parsing,
manifest reading, stdout and exit codes, and nothing else.

Tests now split by what they ask. Logic is unit-tested against literal
inputs, the shells are tested for plumbing only, and release-config.test.ts
is the single place that reads the real manifest — asserting it is
internally consistent, never what it currently contains. Editing
cli/package.json no longer breaks a logic test; a malformed config still
fails. Verified by mutating each field in both directions.

Three intentional behaviour changes:

- compat-check compares the numeric A.B.C core only, ignoring prerelease
  and build suffixes, so Dify 1.16.0-rc1 now satisfies a 1.16.0 window.
  This matches the shipped runtime check in src/version/compat.ts, which
  already stripped suffixes; the release gate was the one disagreeing.
  Removes the hand-rolled prerelease ordering entirely.
- validate now rejects a missing or inverted compat window. It previously
  passed such a config while github-env emitted minDify=undefined.
- release-r2-edge reports a bad channel version under its own name rather
  than release-naming's, since it no longer borrows that script's die().

release-config.test.ts also pins the install scripts to the naming config.
They hardcode artifact names by necessity — they run standalone on a user
machine with no repo and no node — so changing tagPrefix or checksumsSuffix
now fails until all four installers are updated to match, instead of
silently publishing names no installer looks for.

api/commands/__init__.py

@@ -3,7 +3,6 @@ CLI command modules extracted from `commands.py`.
 """
 
 from .account import create_tenant, reset_email, reset_password
-from .app_maintenance import convert_to_agent_apps, fix_app_site_missing
 from .data_migrate import data_migrate, legacy_model_types
 from .data_migration import (
     export_migration_data,
@@ -11,7 +10,6 @@ from .data_migration import (
     import_migration_data,
     migration_data_wizard,
 )
-from .database import upgrade_db
 from .plugin import (
     backfill_plugin_auto_upgrade,
     extract_plugins,
@@ -38,6 +36,12 @@ from .retention import (
     restore_workflow_runs,
 )
 from .storage import clear_orphaned_file_records, file_usage, migrate_oss, remove_orphaned_files_on_storage
+from .system import (
+    convert_to_agent_apps,
+    fix_app_site_missing,
+    reset_encrypt_key_pair,
+    upgrade_db,
+)
 from .vector import (
     add_qdrant_index,
     migrate_annotation_vector_database,
@@ -45,8 +49,6 @@ from .vector import (
     old_metadata_migration,
     vdb_migrate,
 )
-from .workflow_migration import migrate_legacy_sys_files_workflows
-from .workspace import reset_encrypt_key_pair
 
 __all__ = [
     "add_qdrant_index",
@@ -78,7 +80,6 @@ __all__ = [
     "migrate_data_for_plugin",
     "migrate_dataset_permissions_to_rbac",
     "migrate_knowledge_vector_database",
-    "migrate_legacy_sys_files_workflows",
     "migrate_member_roles_to_rbac",
     "migrate_oss",
     "migration_data_wizard",

api/commands/database.py

@@ -1,45 +0,0 @@
-"""Database schema migration CLI commands."""
-
-import logging
-
-import click
-
-from extensions.ext_redis import redis_client
-from libs.db_migration_lock import DbMigrationAutoRenewLock
-
-logger = logging.getLogger(__name__)
-
-DB_UPGRADE_LOCK_TTL_SECONDS = 60
-
-
-@click.command("upgrade-db", help="Upgrade the database")
-def upgrade_db() -> None:
-    click.echo("Preparing database migration...")
-    lock = DbMigrationAutoRenewLock(
-        redis_client=redis_client,
-        name="db_upgrade_lock",
-        ttl_seconds=DB_UPGRADE_LOCK_TTL_SECONDS,
-        logger=logger,
-        log_context="db_migration",
-    )
-    if lock.acquire(blocking=False):
-        migration_succeeded = False
-        try:
-            click.echo(click.style("Starting database migration.", fg="green"))
-
-            import flask_migrate
-
-            flask_migrate.upgrade()
-
-            migration_succeeded = True
-            click.echo(click.style("Database migration successful!", fg="green"))
-
-        except Exception as e:
-            logger.exception("Failed to execute database migration")
-            click.echo(click.style(f"Database migration failed: {e}", fg="red"))
-            raise SystemExit(1)
-        finally:
-            status = "successful" if migration_succeeded else "failed"
-            lock.release_safely(status=status)
-    else:
-        click.echo("Database migration skipped")

api/commands/system.py

@@ -1,27 +1,86 @@
-"""App data maintenance CLI commands."""
-
 import logging
 
 import click
 import sqlalchemy as sa
-from sqlalchemy import select, update
+from sqlalchemy import delete, select, update
+from sqlalchemy.orm import sessionmaker
 
+from configs import dify_config
+from enums.deployment_edition import DeploymentEdition
 from events.app_event import app_was_created
 from extensions.ext_database import db
+from extensions.ext_redis import redis_client
+from libs.db_migration_lock import DbMigrationAutoRenewLock
+from libs.rsa import generate_key_pair
 from models import Tenant
 from models.model import App, AppMode, Conversation
+from models.provider import Provider, ProviderModel
+from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider
 
 logger = logging.getLogger(__name__)
 
+DB_UPGRADE_LOCK_TTL_SECONDS = 60
+
+
+@click.command(
+    "reset-encrypt-key-pair",
+    help="Reset the asymmetric key pair of workspace for encrypt LLM credentials. "
+    "After the reset, all LLM credentials and tool provider credentials "
+    "(builtin / API / MCP) will be purged, requiring re-entry. "
+    "Only support SELF_HOSTED mode.",
+)
+@click.confirmation_option(
+    prompt=click.style(
+        "Are you sure you want to reset encrypt key pair? "
+        "This will also purge builtin / API / MCP tool provider records for every tenant. "
+        "This operation cannot be rolled back!",
+        fg="red",
+    )
+)
+def reset_encrypt_key_pair():
+    """
+    Reset the encrypted key pair of workspace for encrypt LLM credentials.
+    After the reset, all LLM credentials will become invalid, requiring re-entry.
+    Only support SELF_HOSTED mode.
+    """
+    if dify_config.DEPLOYMENT_EDITION == DeploymentEdition.CLOUD:
+        click.echo(click.style("This command is only for SELF_HOSTED installations.", fg="red"))
+        return
+    with sessionmaker(db.engine, expire_on_commit=False).begin() as session:
+        tenants = session.scalars(select(Tenant)).all()
+        for tenant in tenants:
+            if not tenant:
+                click.echo(click.style("No workspaces found. Run /install first.", fg="red"))
+                return
+
+            tenant.encrypt_public_key = generate_key_pair(tenant.id)
+
+            session.execute(delete(Provider).where(Provider.provider_type == "custom", Provider.tenant_id == tenant.id))
+            session.execute(delete(ProviderModel).where(ProviderModel.tenant_id == tenant.id))
+
+            # Purge tool provider records that hold credentials encrypted under the
+            # tenant key. Leaving them in place causes /console/api/workspaces/current/
+            # tool-providers to 500 because decryption fails on stale ciphertext (#35396).
+            session.execute(delete(BuiltinToolProvider).where(BuiltinToolProvider.tenant_id == tenant.id))
+            session.execute(delete(ApiToolProvider).where(ApiToolProvider.tenant_id == tenant.id))
+            session.execute(delete(MCPToolProvider).where(MCPToolProvider.tenant_id == tenant.id))
+
+            click.echo(
+                click.style(
+                    f"Congratulations! The asymmetric key pair of workspace {tenant.id} has been reset.",
+                    fg="green",
+                )
+            )
+
 
 @click.command("convert-to-agent-apps", help="Convert Agent Assistant to Agent App.")
-def convert_to_agent_apps() -> None:
+def convert_to_agent_apps():
     """
     Convert Agent Assistant to Agent App.
     """
     click.echo(click.style("Starting convert to agent apps.", fg="green"))
 
-    proceeded_app_ids: list[str] = []
+    proceeded_app_ids = []
 
     while True:
         # fetch first 1000 apps
@@ -74,14 +133,48 @@ def convert_to_agent_apps() -> None:
     click.echo(click.style(f"Conversion complete. Converted {len(proceeded_app_ids)} agent apps.", fg="green"))
 
 
+@click.command("upgrade-db", help="Upgrade the database")
+def upgrade_db():
+    click.echo("Preparing database migration...")
+    lock = DbMigrationAutoRenewLock(
+        redis_client=redis_client,
+        name="db_upgrade_lock",
+        ttl_seconds=DB_UPGRADE_LOCK_TTL_SECONDS,
+        logger=logger,
+        log_context="db_migration",
+    )
+    if lock.acquire(blocking=False):
+        migration_succeeded = False
+        try:
+            click.echo(click.style("Starting database migration.", fg="green"))
+
+            # run db migration
+            import flask_migrate
+
+            flask_migrate.upgrade()
+
+            migration_succeeded = True
+            click.echo(click.style("Database migration successful!", fg="green"))
+
+        except Exception as e:
+            logger.exception("Failed to execute database migration")
+            click.echo(click.style(f"Database migration failed: {e}", fg="red"))
+            raise SystemExit(1)
+        finally:
+            status = "successful" if migration_succeeded else "failed"
+            lock.release_safely(status=status)
+    else:
+        click.echo("Database migration skipped")
+
+
 @click.command("fix-app-site-missing", help="Fix app related site missing issue.")
-def fix_app_site_missing() -> None:
+def fix_app_site_missing():
     """
     Fix app related site missing issue.
     """
     click.echo(click.style("Starting fix for missing app-related sites.", fg="green"))
 
-    failed_app_ids: list[str] = []
+    failed_app_ids = []
     while True:
         sql = """select apps.id as id from apps left join sites on sites.app_id=apps.id
 where sites.id is null limit 1000"""

api/commands/workflow_migration.py

@@ -1,173 +0,0 @@
-"""Workflow data migration CLI commands.
-
-TODO: Remove the legacy system file workflow migration command after the production migration is complete.
-"""
-
-import logging
-from dataclasses import dataclass
-
-import click
-from sqlalchemy import select
-from sqlalchemy.orm import Session, load_only, sessionmaker
-
-from extensions.ext_database import db
-from models.workflow import Workflow, WorkflowType
-
-logger = logging.getLogger(__name__)
-
-
-@dataclass
-class LegacySysFilesWorkflowMigrationStats:
-    scanned: int = 0
-    migrated: int = 0
-    failed: int = 0
-    batches: int = 0
-    last_id: str | None = None
-
-
-def _build_legacy_sys_files_workflow_query(
-    *,
-    start_after_id: str | None,
-    batch_size: int,
-    tenant_id: str | None,
-    app_id: str | None,
-):
-    # Workflow IDs are UUID4, so this is not chronological pagination. The migration only needs a stable total
-    # order that matches the resume cursor; ordering by the same primary-key column used in the `id > cursor`
-    # predicate lets each batch continue deterministically without offset scans.
-    stmt = (
-        select(Workflow)
-        .options(load_only(Workflow.id, Workflow.type, Workflow.graph))
-        .where(Workflow.type.in_((WorkflowType.WORKFLOW, WorkflowType.CHAT)))
-        .order_by(Workflow.id)
-        .limit(batch_size)
-    )
-    if start_after_id:
-        stmt = stmt.where(Workflow.id > start_after_id)
-    if tenant_id:
-        stmt = stmt.where(Workflow.tenant_id == tenant_id)
-    if app_id:
-        stmt = stmt.where(Workflow.app_id == app_id)
-    return stmt
-
-
-def _migrate_legacy_sys_files_workflow_batch(
-    *,
-    session: Session,
-    start_after_id: str | None,
-    batch_size: int,
-    tenant_id: str | None,
-    app_id: str | None,
-    dry_run: bool,
-) -> LegacySysFilesWorkflowMigrationStats:
-    stats = LegacySysFilesWorkflowMigrationStats()
-    workflows = session.scalars(
-        _build_legacy_sys_files_workflow_query(
-            start_after_id=start_after_id,
-            batch_size=batch_size,
-            tenant_id=tenant_id,
-            app_id=app_id,
-        )
-    ).all()
-
-    for workflow in workflows:
-        stats.scanned += 1
-        stats.last_id = workflow.id
-        try:
-            if workflow.migrate_legacy_sys_files_graph_in_place():
-                stats.migrated += 1
-        except Exception:
-            stats.failed += 1
-            logger.exception("Failed to migrate legacy sys.files workflow, workflow_id=%s", workflow.id)
-
-    if dry_run:
-        session.rollback()
-    else:
-        session.commit()
-    return stats
-
-
-def run_legacy_sys_files_workflow_migration(
-    *,
-    batch_size: int,
-    limit: int | None,
-    start_after_id: str | None,
-    tenant_id: str | None,
-    app_id: str | None,
-    dry_run: bool,
-) -> LegacySysFilesWorkflowMigrationStats:
-    """Scan Workflow and Advanced Chat graphs in keyset-paginated batches."""
-    if batch_size <= 0:
-        raise click.UsageError("--batch-size must be greater than 0")
-    if limit is not None and limit <= 0:
-        raise click.UsageError("--limit must be greater than 0 when provided")
-
-    session_maker = sessionmaker(db.engine, expire_on_commit=False)
-    total = LegacySysFilesWorkflowMigrationStats(last_id=start_after_id)
-    next_start_after_id = start_after_id
-
-    while limit is None or total.scanned < limit:
-        remaining = None if limit is None else limit - total.scanned
-        current_batch_size = batch_size if remaining is None else min(batch_size, remaining)
-        if current_batch_size <= 0:
-            break
-
-        with session_maker() as session:
-            batch_stats = _migrate_legacy_sys_files_workflow_batch(
-                session=session,
-                start_after_id=next_start_after_id,
-                batch_size=current_batch_size,
-                tenant_id=tenant_id,
-                app_id=app_id,
-                dry_run=dry_run,
-            )
-
-        if batch_stats.scanned == 0:
-            break
-
-        total.scanned += batch_stats.scanned
-        total.migrated += batch_stats.migrated
-        total.failed += batch_stats.failed
-        total.batches += 1
-        total.last_id = batch_stats.last_id
-        next_start_after_id = batch_stats.last_id
-
-        if batch_stats.scanned < current_batch_size:
-            break
-
-    return total
-
-
-@click.command(
-    "migrate-legacy-sys-files-workflows",
-    help="Migrate Workflow and Advanced Chat graphs that still reference deprecated sys.files.",
-)
-@click.option("--batch-size", default=1000, show_default=True, type=int, help="Number of workflows to scan per batch.")
-@click.option("--limit", default=None, type=int, help="Maximum number of workflows to scan in this run.")
-@click.option("--start-after-id", default=None, help="Resume scanning after this workflow ID.")
-@click.option("--tenant-id", default=None, help="Limit migration to one tenant.")
-@click.option("--app-id", default=None, help="Limit migration to one app.")
-@click.option("--dry-run", is_flag=True, default=False, help="Scan and report without saving changes.")
-def migrate_legacy_sys_files_workflows(
-    batch_size: int,
-    limit: int | None,
-    start_after_id: str | None,
-    tenant_id: str | None,
-    app_id: str | None,
-    dry_run: bool,
-) -> None:
-    stats = run_legacy_sys_files_workflow_migration(
-        batch_size=batch_size,
-        limit=limit,
-        start_after_id=start_after_id,
-        tenant_id=tenant_id,
-        app_id=app_id,
-        dry_run=dry_run,
-    )
-    click.echo(
-        "Legacy sys.files workflow migration finished: "
-        f"scanned={stats.scanned} migrated={stats.migrated} failed={stats.failed} "
-        f"batches={stats.batches} last_id={stats.last_id or ''}"
-    )
-    if dry_run:
-        click.echo("Dry run only: no workflow graph changes were saved.")

api/commands/workspace.py

@@ -1,64 +0,0 @@
-"""Workspace maintenance CLI commands."""
-
-import click
-from sqlalchemy import delete, select
-from sqlalchemy.orm import sessionmaker
-
-from configs import dify_config
-from enums.deployment_edition import DeploymentEdition
-from extensions.ext_database import db
-from libs.rsa import generate_key_pair
-from models import Tenant
-from models.provider import Provider, ProviderModel
-from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider
-
-
-@click.command(
-    "reset-encrypt-key-pair",
-    help="Reset the asymmetric key pair of workspace for encrypt LLM credentials. "
-    "After the reset, all LLM credentials and tool provider credentials "
-    "(builtin / API / MCP) will be purged, requiring re-entry. "
-    "Only support SELF_HOSTED mode.",
-)
-@click.confirmation_option(
-    prompt=click.style(
-        "Are you sure you want to reset encrypt key pair? "
-        "This will also purge builtin / API / MCP tool provider records for every tenant. "
-        "This operation cannot be rolled back!",
-        fg="red",
-    )
-)
-def reset_encrypt_key_pair() -> None:
-    """
-    Reset the encrypted key pair of workspace for encrypt LLM credentials.
-    After the reset, all LLM credentials will become invalid, requiring re-entry.
-    Only support SELF_HOSTED mode.
-    """
-    if dify_config.DEPLOYMENT_EDITION == DeploymentEdition.CLOUD:
-        click.echo(click.style("This command is only for SELF_HOSTED installations.", fg="red"))
-        return
-    with sessionmaker(db.engine, expire_on_commit=False).begin() as session:
-        tenants = session.scalars(select(Tenant)).all()
-        for tenant in tenants:
-            if not tenant:
-                click.echo(click.style("No workspaces found. Run /install first.", fg="red"))
-                return
-
-            tenant.encrypt_public_key = generate_key_pair(tenant.id)
-
-            session.execute(delete(Provider).where(Provider.provider_type == "custom", Provider.tenant_id == tenant.id))
-            session.execute(delete(ProviderModel).where(ProviderModel.tenant_id == tenant.id))
-
-            # Purge tool provider records that hold credentials encrypted under the
-            # tenant key. Leaving them in place causes /console/api/workspaces/current/
-            # tool-providers to 500 because decryption fails on stale ciphertext (#35396).
-            session.execute(delete(BuiltinToolProvider).where(BuiltinToolProvider.tenant_id == tenant.id))
-            session.execute(delete(ApiToolProvider).where(ApiToolProvider.tenant_id == tenant.id))
-            session.execute(delete(MCPToolProvider).where(MCPToolProvider.tenant_id == tenant.id))
-
-            click.echo(
-                click.style(
-                    f"Congratulations! The asymmetric key pair of workspace {tenant.id} has been reset.",
-                    fg="green",
-                )
-            )

api/controllers/service_api/app/completion.py

@@ -26,10 +26,6 @@ from controllers.service_api.app.error import (
     ProviderQuotaExceededError,
     WorkflowVersionExecutionNotAllowedError,
 )
-from controllers.service_api.app.legacy_system_files import (
-    attach_legacy_system_file_warning_for_service_api,
-    normalize_legacy_system_file_args_for_service_api,
-)
 from controllers.service_api.schema import (
     InputFileList,
     expect_user_json,
@@ -394,7 +390,6 @@ class ChatApi(Resource):
             args["external_trace_id"] = external_trace_id
 
         streaming = _resolve_agent_app_streaming(app_mode=app_mode, response_mode=payload.response_mode)
-        legacy_system_file_compat = None
 
         try:
             # Eagerly validate conversation to avoid hanging on invalid conversation_id
@@ -406,14 +401,6 @@ class ChatApi(Resource):
                     session=session,
                 )
 
-            if app_mode == AppMode.ADVANCED_CHAT:
-                args, legacy_system_file_compat = normalize_legacy_system_file_args_for_service_api(
-                    session=session,
-                    app_model=app_model,
-                    args=args,
-                    raw_payload=service_api_ns.payload,
-                    workflow_id=args.get("workflow_id"),
-                )
             response = AppGenerateService.generate(
                 session=session,
                 app_model=app_model,
@@ -422,7 +409,6 @@ class ChatApi(Resource):
                 invoke_from=InvokeFrom.SERVICE_API,
                 streaming=streaming,
             )
-            response = attach_legacy_system_file_warning_for_service_api(response, legacy_system_file_compat)
 
             # response-contract:ignore compact_generate_response
             return helper.compact_generate_response(response)

api/controllers/service_api/app/legacy_system_files.py

@@ -1,72 +0,0 @@
-"""Temporary Service API adapter for the deprecated workflow file input."""
-
-from collections.abc import Generator, Mapping
-from typing import Any
-
-from sqlalchemy.orm import Session
-
-from core.app.entities.app_invoke_entities import InvokeFrom
-from core.app.features.rate_limiting.rate_limit import RateLimitGenerator
-from core.workflow.legacy_system_files import (
-    LegacySysFilesCompatVariable,
-    attach_legacy_sys_files_warning,
-    normalize_legacy_sys_files_args,
-)
-from models.model import App
-from services.app_generate_service import AppGenerateService
-
-type ServiceAPIGenerateResponse = Mapping[str, Any] | Generator[str, None, None] | RateLimitGenerator
-
-
-def normalize_legacy_system_file_args_for_service_api(
-    *,
-    session: Session,
-    app_model: App,
-    args: dict[str, Any],
-    raw_payload: Mapping[str, Any] | None,
-    workflow_id: str | None = None,
-) -> tuple[dict[str, Any], LegacySysFilesCompatVariable | None]:
-    # TODO: Remove this hidden Service API compatibility path after all persisted workflows are migrated.
-    args_with_hidden_system = _copy_hidden_system_files_arg(args=args, raw_payload=raw_payload)
-    if not _has_legacy_file_arg(args_with_hidden_system):
-        return args, None
-
-    workflow = AppGenerateService.get_workflow(
-        app_model,
-        InvokeFrom.SERVICE_API,
-        workflow_id,
-        session=session,
-    )
-    return normalize_legacy_sys_files_args(graph=workflow.graph_dict, args=args_with_hidden_system)
-
-
-def attach_legacy_system_file_warning_for_service_api(
-    response: ServiceAPIGenerateResponse,
-    compat_variable: LegacySysFilesCompatVariable | None,
-) -> ServiceAPIGenerateResponse:
-    # TODO: Remove this warning once Service API clients no longer need the legacy migration notice.
-    if compat_variable is None:
-        return response
-    return attach_legacy_sys_files_warning(response, compat_variable)
-
-
-def _copy_hidden_system_files_arg(
-    *,
-    args: dict[str, Any],
-    raw_payload: Mapping[str, Any] | None,
-) -> dict[str, Any]:
-    system = raw_payload.get("system") if isinstance(raw_payload, Mapping) else None
-    if not isinstance(system, Mapping) or "files" not in system or system["files"] is None:
-        return args
-
-    copied_args = dict(args)
-    copied_args["system"] = {"files": system["files"]}
-    return copied_args
-
-
-def _has_legacy_file_arg(args: Mapping[str, Any]) -> bool:
-    if args.get("files") is not None:
-        return True
-
-    system = args.get("system")
-    return isinstance(system, Mapping) and system.get("files") is not None

api/controllers/service_api/app/workflow.py

@@ -30,10 +30,6 @@ from controllers.service_api.app.error import (
     ProviderQuotaExceededError,
     WorkflowVersionExecutionNotAllowedError,
 )
-from controllers.service_api.app.legacy_system_files import (
-    attach_legacy_system_file_warning_for_service_api,
-    normalize_legacy_system_file_args_for_service_api,
-)
 from controllers.service_api.schema import (
     expect_user_json,
     expect_with_user,
@@ -348,12 +344,6 @@ class WorkflowRunApi(Resource):
         streaming = payload.response_mode == "streaming"
 
         try:
-            args, legacy_system_file_compat = normalize_legacy_system_file_args_for_service_api(
-                session=session,
-                app_model=app_model,
-                args=args,
-                raw_payload=service_api_ns.payload,
-            )
             response = AppGenerateService.generate(
                 session=session,
                 app_model=app_model,
@@ -362,7 +352,6 @@ class WorkflowRunApi(Resource):
                 invoke_from=InvokeFrom.SERVICE_API,
                 streaming=streaming,
             )
-            response = attach_legacy_system_file_warning_for_service_api(response, legacy_system_file_compat)
 
             # response-contract:ignore compact_generate_response
             return helper.compact_generate_response(response)
@@ -482,13 +471,6 @@ class WorkflowRunByIdApi(Resource):
         streaming = payload.response_mode == "streaming"
 
         try:
-            args, legacy_system_file_compat = normalize_legacy_system_file_args_for_service_api(
-                session=session,
-                app_model=app_model,
-                args=args,
-                raw_payload=service_api_ns.payload,
-                workflow_id=workflow_id,
-            )
             response = AppGenerateService.generate(
                 session=session,
                 app_model=app_model,
@@ -497,7 +479,6 @@ class WorkflowRunByIdApi(Resource):
                 invoke_from=InvokeFrom.SERVICE_API,
                 streaming=streaming,
             )
-            response = attach_legacy_system_file_warning_for_service_api(response, legacy_system_file_compat)
 
             # response-contract:ignore compact_generate_response
             return helper.compact_generate_response(response)

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

@@ -46,7 +46,6 @@ from core.ops.ops_trace_manager import TraceQueueManager
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
 from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
-from core.workflow.legacy_system_files import normalize_legacy_sys_files_args
 from extensions.ext_database import db
 from factories import file_factory
 from graphon.filters import ResponseStreamFilter
@@ -148,8 +147,6 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
         if not args.get("query"):
             raise ValueError("query is required")
 
-        # TODO: Remove this compatibility normalization after all persisted workflows are migrated.
-        args, _ = normalize_legacy_sys_files_args(graph=workflow.graph_dict, args=args)
         query = args["query"]
         if not isinstance(query, str):
             raise ValueError("query must be a string")

api/core/app/apps/common/workflow_response_converter.py

@@ -155,10 +155,8 @@ class WorkflowResponseConverter:
             # TODO(@future-refactor): store system variables separately from user inputs so we don't
             # need to flatten `sys.*` entries into the input payload just for rerun/export tooling.
             if field_name == SystemVariableKey.CONVERSATION_ID:
-                # Conversation IDs are session-scoped; omitting them keeps workflow inputs reusable.
-                continue
-            if field_name == SystemVariableKey.FILES:
-                # When files are exposed as an input, application inputs use the canonical `userinput.files` key.
+                # Conversation IDs are session-scoped; omitting them keeps workflow inputs
+                # reusable without pinning new runs to a prior conversation.
                 continue
             inputs[f"sys.{field_name}"] = value
         handled = WorkflowEntry.handle_special_values(inputs)

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

@@ -41,7 +41,6 @@ from core.helper.trace_id_helper import (
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
-from core.workflow.legacy_system_files import normalize_legacy_sys_files_args
 from extensions.ext_database import db
 from factories import file_factory
 from graphon.filters import ResponseStreamFilter
@@ -165,8 +164,6 @@ class WorkflowAppGenerator(BaseAppGenerator):
         pause_state_config: PauseStateLayerConfig | None = None,
     ) -> Mapping[str, Any] | Generator[Mapping[str, Any] | str, None, None]:
         with self._bind_file_access_scope(tenant_id=app_model.tenant_id, user=user, invoke_from=invoke_from):
-            # TODO: Remove this compatibility normalization after all persisted workflows are migrated.
-            args, _ = normalize_legacy_sys_files_args(graph=workflow.graph_dict, args=args)
             files: Sequence[Mapping[str, Any]] = args.get("files") or []
 
             # parse files

api/core/plugin/plugin_service.py

@@ -66,7 +66,7 @@ from services.enterprise.plugin_manager_service import (
     PreUninstallPluginRequest,
 )
 from services.errors.plugin import PluginInstallationForbiddenError
-from services.feature_service import FeatureService, PluginInstallationPermissionModel, PluginInstallationScope
+from services.feature_service import FeatureService, PluginInstallationScope
 
 logger = logging.getLogger(__name__)
 _provider_entities_adapter: TypeAdapter[list[ProviderEntity]] = TypeAdapter(list[ProviderEntity])
@@ -604,30 +604,22 @@ class PluginService:
             return result
 
     @staticmethod
-    def _check_marketplace_only_permission() -> None:
+    def _check_marketplace_only_permission():
         """
         Check if the marketplace only permission is enabled
         """
-        permission = PluginService._get_plugin_installation_permission()
-        if permission.restrict_to_marketplace_only:
+        features = FeatureService.get_system_features()
+        if features.plugin_installation_permission.restrict_to_marketplace_only:
             raise PluginInstallationForbiddenError("Plugin installation is restricted to marketplace only")
 
     @staticmethod
-    def _get_plugin_installation_permission() -> PluginInstallationPermissionModel:
-        """Resolve the validated policy and reject deny-all before any installation side effect."""
-        permission = FeatureService.get_plugin_installation_permission()
-        if permission.plugin_installation_scope == PluginInstallationScope.NONE:
-            raise PluginInstallationForbiddenError("Installing plugins is not allowed")
-        return permission
-
-    @staticmethod
-    def _check_plugin_installation_scope(plugin_verification: PluginVerification | None) -> None:
+    def _check_plugin_installation_scope(plugin_verification: PluginVerification | None):
         """
         Check the plugin installation scope
         """
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
 
-        match permission.plugin_installation_scope:
+        match features.plugin_installation_permission.plugin_installation_scope:
             case PluginInstallationScope.OFFICIAL_ONLY:
                 if (
                     plugin_verification is None
@@ -642,10 +634,10 @@ class PluginService:
                     raise PluginInstallationForbiddenError(
                         "Plugin installation is restricted to official and specific partners"
                     )
+            case PluginInstallationScope.NONE:
+                raise PluginInstallationForbiddenError("Installing plugins is not allowed")
             case PluginInstallationScope.ALL:
                 pass
-            case _:
-                raise PluginInstallationForbiddenError("Plugin installation policy is invalid")
 
     @staticmethod
     def get_debugging_key(tenant_id: str) -> str:
@@ -915,7 +907,7 @@ class PluginService:
         # check if plugin pkg is already downloaded
         manager = PluginInstaller()
 
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
 
         try:
             manager.fetch_plugin_manifest(tenant_id, new_plugin_unique_identifier)
@@ -927,7 +919,7 @@ class PluginService:
             response = manager.upload_pkg(
                 tenant_id,
                 pkg,
-                verify_signature=permission.restrict_to_marketplace_only,
+                verify_signature=features.plugin_installation_permission.restrict_to_marketplace_only,
             )
 
             # check if the plugin is available to install
@@ -982,11 +974,11 @@ class PluginService:
         """
         PluginService._check_marketplace_only_permission()
         manager = PluginInstaller()
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
         response = manager.upload_pkg(
             tenant_id,
             pkg,
-            verify_signature=permission.restrict_to_marketplace_only,
+            verify_signature=features.plugin_installation_permission.restrict_to_marketplace_only,
         )
         PluginService._check_plugin_installation_scope(response.verification)
 
@@ -1004,13 +996,13 @@ class PluginService:
         pkg = download_with_size_limit(
             f"https://github.com/{repo}/releases/download/{version}/{package}", dify_config.PLUGIN_MAX_PACKAGE_SIZE
         )
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
 
         manager = PluginInstaller()
         response = manager.upload_pkg(
             tenant_id,
             pkg,
-            verify_signature=permission.restrict_to_marketplace_only,
+            verify_signature=features.plugin_installation_permission.restrict_to_marketplace_only,
         )
         PluginService._check_plugin_installation_scope(response.verification)
 
@@ -1084,7 +1076,7 @@ class PluginService:
         if not dify_config.MARKETPLACE_ENABLED:
             raise ValueError("marketplace is not enabled")
 
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
 
         manager = PluginInstaller()
         try:
@@ -1094,7 +1086,7 @@ class PluginService:
             response = manager.upload_pkg(
                 tenant_id,
                 pkg,
-                verify_signature=permission.restrict_to_marketplace_only,
+                verify_signature=features.plugin_installation_permission.restrict_to_marketplace_only,
             )
             # check if the plugin is available to install
             PluginService._check_plugin_installation_scope(response.verification)
@@ -1116,7 +1108,7 @@ class PluginService:
         # collect actual plugin_unique_identifiers
         actual_plugin_unique_identifiers = []
         metas = []
-        permission = PluginService._get_plugin_installation_permission()
+        features = FeatureService.get_system_features()
 
         # check if already downloaded
         for plugin_unique_identifier in plugin_unique_identifiers:
@@ -1134,7 +1126,7 @@ class PluginService:
                 response = manager.upload_pkg(
                     tenant_id,
                     pkg,
-                    verify_signature=permission.restrict_to_marketplace_only,
+                    verify_signature=features.plugin_installation_permission.restrict_to_marketplace_only,
                 )
                 # check if the plugin is available to install
                 PluginService._check_plugin_installation_scope(response.verification)

api/core/tools/mcp_tool/tool.py

@@ -107,8 +107,6 @@ class MCPTool(Tool):
         if self.entity.output_schema and result.structuredContent:
             for k, v in result.structuredContent.items():
                 yield self.create_variable_message(k, v)
-        elif result.structuredContent:
-            yield self.create_json_message(result.structuredContent)
 
     def _process_text_content(self, content: TextContent) -> Generator[ToolInvokeMessage, None, None]:
         """Process text content and yield appropriate messages."""

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

@@ -42,9 +42,9 @@ _NODE_SNIPPETS: dict[str, str] = {
     ["local_file", "remote_url"]. Only when you include "custom" must you
     also set ``allowed_file_extensions`` to a non-empty list like
     [".epub", ".rtf"]; otherwise leave it [].
-    In Advanced-Chat mode ``sys.query`` is automatic. ``userinput.files`` is
-    the automatic file-upload variable in both app modes. Downstream nodes
-    may reference these variables; do NOT add them to ``variables``.""",
+    In Advanced-Chat mode ``sys.query`` and ``sys.files`` are automatic
+    system variables — downstream nodes may reference them; do NOT add
+    them to ``variables``.""",
     "end": """\
 - end (Workflow mode only):
     {"outputs": [
@@ -168,8 +168,8 @@ _NODE_SNIPPETS: dict[str, str] = {
     Single output variable ``text``: a string when ``is_array_file`` is false,
     an array of strings (one per file) when it is true. ``variable_selector``
     MUST point at a ``start`` variable declared with type "file" / "file-list"
-    (or the automatic ``userinput.files`` variable). A declared start variable
-    MUST set a non-empty ``allowed_file_types`` (use ["document"] for document text).""",
+    (or ``sys.files`` in Advanced-Chat mode). That start variable MUST set a
+    non-empty ``allowed_file_types`` (use ["document"] for document text).""",
     "variable-aggregator": """\
 - variable-aggregator  (merge mutually-exclusive branches into one output):
     {"output_type": "string",        # VarType of the merged value — one of

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

@@ -91,20 +91,21 @@ def format_parallel_plan(
 def format_mode_section(mode: str) -> str:
     """Tell each builder which app mode it is configuring for.
 
-    ``sys.query`` is available in advanced-chat, while ``userinput.files`` is
-    available in both app modes. Without this guidance the model invents
-    start-node variables that postprocess then materializes as spurious inputs.
+    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 userinput.files. Use placeholder {{#sys.query#}} or selector "
-            '["userinput", "files"] directly; do NOT invent start-node variables for them.\n\n'
+            '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: uploaded files are available as userinput.files; all other user input must use "
+        "workflow: there are NO automatic system variables; reference user input only through "
         "the start node's declared variables.\n\n"
     )
 

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

@@ -96,10 +96,10 @@ minimum set of Dify workflow nodes needed to fulfil it, in execution order.
       - "text-input" for short single-line values (URLs, names),
       - "paragraph" for free-form multi-line text (descriptions, queries),
       - "number" / "select" / "file" / "file-list" for the obvious cases.
-    In Advanced-Chat mode ``sys.query`` is automatic. ``userinput.files`` is
-    automatic in both app modes. Downstream nodes may reference these values
-    without a ``start_inputs`` entry; every other user-supplied Workflow value
-    must be declared in ``start_inputs``.
+    In Advanced-Chat mode the ``sys.query`` / ``sys.files`` system
+    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. 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.

api/core/workflow/generator/runner.py

@@ -1382,8 +1382,8 @@ class WorkflowGenerator:
         multiple outputs remain untouched so validation fails closed instead
         of guessing which value the workflow should consume.
 
-        ``sys.query`` in Advanced-Chat mode and ``userinput.files`` in either mode
-        are treated as resolved without declarations. Tool nodes' parameter
+        For Advanced-Chat mode, ``sys.query`` and ``sys.files`` are always
+        treated as resolved without any declaration. Tool nodes' parameter
         references aren't validated here because we don't know each tool's
         schema — the run time validates those.
         """
@@ -1398,12 +1398,9 @@ class WorkflowGenerator:
         for node in nodes:
             cls._collect_refs_in_data(node.get("data") or {}, refs)
 
-        automatic_refs = {("userinput", "files")}
-        if mode == "advanced-chat":
-            automatic_refs.add(("sys", "query"))
-
         for node_id, var in refs:
-            if (node_id, var) in automatic_refs:
+            # Advanced-Chat system variables are always resolved.
+            if mode == "advanced-chat" and node_id == "sys":
                 continue
             target = nodes_by_id.get(node_id)
             if target is None:

api/core/workflow/legacy_system_files.py

@@ -1,218 +0,0 @@
-"""Compatibility helpers for workflows that still reference deprecated `sys.files`.
-
-TODO: Remove this module after all persisted Workflow and Advanced Chat graphs
-have been migrated from the deprecated system file variable to `userinput.files`.
-"""
-
-from __future__ import annotations
-
-import json
-from collections.abc import Generator, Iterable, Mapping
-from dataclasses import dataclass
-from typing import Any
-
-_LEGACY_SYSTEM_NODE_ID = "sys"
-_USER_INPUT_NODE_ID = "userinput"
-_LEGACY_FILES_VARIABLE = "files"
-_USER_INPUT_FILE_SELECTOR = [_USER_INPUT_NODE_ID, _LEGACY_FILES_VARIABLE]
-_USER_INPUT_FILE_INPUT_KEY = ".".join(_USER_INPUT_FILE_SELECTOR)
-_LEGACY_FILES_TEMPLATE = "{{#sys.files#}}"
-_USER_INPUT_FILES_TEMPLATE = "{{#userinput.files#}}"
-
-
-@dataclass(frozen=True)
-class LegacySysFilesCompatVariable:
-    node_id: str
-    variable_name: str
-
-
-@dataclass(frozen=True)
-class LegacySysFilesGraphMigrationResult:
-    graph: dict[str, Any]
-    changed: bool
-
-
-def migrate_legacy_sys_files_graph_with_result(
-    graph: Mapping[str, Any],
-) -> LegacySysFilesGraphMigrationResult:
-    """Return the migrated graph and whether any legacy reference was rewritten."""
-
-    graph_copy = dict(graph)
-    nodes = graph_copy.get("nodes")
-    if not isinstance(nodes, list):
-        return LegacySysFilesGraphMigrationResult(graph=graph_copy, changed=False)
-
-    # Legacy references are stored in node data. Restricting both search and replacement to `nodes`
-    # avoids recursively scanning graph-level metadata and edges for every workflow load.
-    if not _contains_legacy_sys_files_reference(nodes):
-        return LegacySysFilesGraphMigrationResult(graph=graph_copy, changed=False)
-
-    graph_copy["nodes"] = _replace_legacy_sys_files_references(nodes)
-    return LegacySysFilesGraphMigrationResult(graph=graph_copy, changed=True)
-
-
-def resolve_legacy_sys_files_compat_variable(graph: Mapping[str, Any]) -> LegacySysFilesCompatVariable | None:
-    """Resolve the target variable used by the `sys.files` compatibility layer."""
-
-    nodes = graph.get("nodes")
-    if not isinstance(nodes, list):
-        return None
-    if not _contains_file_input_reference(nodes):
-        return None
-    return LegacySysFilesCompatVariable(node_id=_USER_INPUT_NODE_ID, variable_name=_LEGACY_FILES_VARIABLE)
-
-
-def normalize_legacy_sys_files_args(
-    *,
-    graph: Mapping[str, Any],
-    args: Mapping[str, Any],
-) -> tuple[dict[str, Any], LegacySysFilesCompatVariable | None]:
-    """Map Service/Web API file arguments onto the `userinput.files` system alias.
-
-    The top-level `files` argument and hidden `system.files` payload both feed
-    the same runtime file collection. After graph references are migrated, the
-    file collection is exposed in the variable pool as `userinput.files`.
-    """
-
-    normalized_args = dict(args)
-    files_from_input, input_files_used = _extract_userinput_files(args)
-    if input_files_used:
-        normalized_args["files"] = files_from_input
-        return normalized_args, None
-
-    compat_variable = resolve_legacy_sys_files_compat_variable(graph)
-    if compat_variable is None:
-        return normalized_args, None
-
-    files, legacy_files_used = _extract_legacy_files(args)
-    if not legacy_files_used:
-        return normalized_args, None
-
-    if normalized_args.get("files") is None:
-        normalized_args["files"] = files
-
-    raw_inputs = normalized_args.get("inputs")
-    inputs = dict(raw_inputs) if isinstance(raw_inputs, Mapping) else {}
-    inputs.setdefault(_USER_INPUT_FILE_INPUT_KEY, files)
-    normalized_args["inputs"] = inputs
-    return normalized_args, compat_variable
-
-
-def attach_legacy_sys_files_warning(
-    response: Mapping[str, Any] | Iterable[Any],
-    compat_variable: LegacySysFilesCompatVariable,
-) -> Mapping[str, Any] | Generator[str, None, None]:
-    warning = build_legacy_sys_files_warning(compat_variable)
-    if isinstance(response, Mapping):
-        response_with_warning = dict(response)
-        existing_warnings = response_with_warning.get("warnings")
-        warnings = list(existing_warnings) if isinstance(existing_warnings, list) else []
-        warnings.append(warning)
-        response_with_warning["warnings"] = warnings
-        return response_with_warning
-
-    def _with_warning() -> Generator[str, None, None]:
-        try:
-            yield f"data: {json.dumps({'event': 'warning', 'warning': warning})}\n\n"
-            yield from response
-        finally:
-            close = getattr(response, "close", None)
-            if callable(close):
-                close()
-
-    return _with_warning()
-
-
-def build_legacy_sys_files_warning(compat_variable: LegacySysFilesCompatVariable) -> str:
-    variable_selector = ".".join((compat_variable.node_id, compat_variable.variable_name))
-    return (
-        "sys.files is deprecated. This workflow now reads files from "
-        f"`{variable_selector}`; update Service API calls to pass files in "
-        f"`inputs.{variable_selector}` instead of `system.files` or top-level `files`."
-    )
-
-
-def _contains_legacy_sys_files_reference(value: Any) -> bool:
-    if _is_legacy_sys_files_selector(value):
-        return True
-
-    if isinstance(value, str):
-        return _LEGACY_FILES_TEMPLATE in value
-
-    if isinstance(value, Mapping):
-        return any(_contains_legacy_sys_files_reference(item) for item in value.values())
-
-    if isinstance(value, list):
-        return any(_contains_legacy_sys_files_reference(item) for item in value)
-
-    return False
-
-
-def _contains_file_input_reference(value: Any) -> bool:
-    if _is_legacy_sys_files_selector(value) or _is_userinput_files_selector(value):
-        return True
-
-    if isinstance(value, str):
-        return _LEGACY_FILES_TEMPLATE in value or _USER_INPUT_FILES_TEMPLATE in value
-
-    if isinstance(value, Mapping):
-        return any(_contains_file_input_reference(item) for item in value.values())
-
-    if isinstance(value, list):
-        return any(_contains_file_input_reference(item) for item in value)
-
-    return False
-
-
-def _replace_legacy_sys_files_references(value: Any) -> Any:
-    if _is_legacy_sys_files_selector(value):
-        return list(_USER_INPUT_FILE_SELECTOR)
-
-    if isinstance(value, str):
-        return value.replace(_LEGACY_FILES_TEMPLATE, _USER_INPUT_FILES_TEMPLATE)
-
-    if isinstance(value, Mapping):
-        return {key: _replace_legacy_sys_files_references(item) for key, item in value.items()}
-
-    if isinstance(value, list):
-        return [_replace_legacy_sys_files_references(item) for item in value]
-
-    return value
-
-
-def _is_legacy_sys_files_selector(value: Any) -> bool:
-    return (
-        isinstance(value, list)
-        and len(value) == 2
-        and value[0] == _LEGACY_SYSTEM_NODE_ID
-        and value[1] == _LEGACY_FILES_VARIABLE
-    )
-
-
-def _is_userinput_files_selector(value: Any) -> bool:
-    return isinstance(value, list) and value == _USER_INPUT_FILE_SELECTOR
-
-
-def serialized_graph_may_contain_legacy_sys_files(serialized_graph: str) -> bool:
-    """Cheaply reject stored graphs that cannot contain a legacy file reference."""
-
-    return _LEGACY_FILES_TEMPLATE in serialized_graph or ('"sys"' in serialized_graph and '"files"' in serialized_graph)
-
-
-def _extract_legacy_files(args: Mapping[str, Any]) -> tuple[Any, bool]:
-    if "files" in args and args["files"] is not None:
-        return args["files"], True
-
-    system = args.get("system")
-    if isinstance(system, Mapping) and "files" in system and system["files"] is not None:
-        return system["files"], True
-
-    return None, False
-
-
-def _extract_userinput_files(args: Mapping[str, Any]) -> tuple[Any, bool]:
-    inputs = args.get("inputs")
-    if isinstance(inputs, Mapping) and inputs.get(_USER_INPUT_FILE_INPUT_KEY) is not None:
-        return inputs[_USER_INPUT_FILE_INPUT_KEY], True
-
-    return None, False

api/core/workflow/nodes/agent_v2/runtime_request_builder.py

@@ -368,7 +368,7 @@ class WorkflowAgentRuntimeRequestBuilder:
 
         if uploaded_files is not None:
             lines.append("- Uploaded workflow files:")
-            lines.append(f"  - userinput.files: {uploaded_files}")
+            lines.append(f"  - sys.files: {uploaded_files}")
 
         if resolved_outputs:
             lines.append("- Previous node outputs:")

api/core/workflow/system_variables.py

@@ -16,7 +16,6 @@ from .variable_prefixes import (
     ENVIRONMENT_VARIABLE_NODE_ID,
     RAG_PIPELINE_VARIABLE_NODE_ID,
     SYSTEM_VARIABLE_NODE_ID,
-    USER_INPUT_VARIABLE_NODE_ID,
 )
 
 
@@ -119,12 +118,6 @@ def build_bootstrap_variables(
         *(_with_selector(variable, ENVIRONMENT_VARIABLE_NODE_ID) for variable in environment_variables),
         *(_with_selector(variable, CONVERSATION_VARIABLE_NODE_ID) for variable in conversation_variables),
     ]
-    # TODO: Stop emitting the legacy `sys.files` selector after stored graphs and Service API callers are migrated.
-    # `userinput.files` remains the canonical file-upload variable.
-    for variable in system_variables:
-        if variable.name == SystemVariableKey.FILES.value:
-            variables.append(_with_selector(variable, USER_INPUT_VARIABLE_NODE_ID))
-            break
 
     rag_pipeline_variables_map: defaultdict[str, dict[str, Any]] = defaultdict(dict)
     for rag_var in rag_pipeline_variables:

api/core/workflow/variable_prefixes.py

@@ -1,5 +1,4 @@
 SYSTEM_VARIABLE_NODE_ID = "sys"
-USER_INPUT_VARIABLE_NODE_ID = "userinput"
 ENVIRONMENT_VARIABLE_NODE_ID = "env"
 CONVERSATION_VARIABLE_NODE_ID = "conversation"
 RAG_PIPELINE_VARIABLE_NODE_ID = "rag"

api/extensions/ext_commands.py

@@ -29,7 +29,6 @@ def init_app(app: DifyApp):
         install_rag_pipeline_plugins,
         migrate_data_for_plugin,
         migrate_dataset_permissions_to_rbac,
-        migrate_legacy_sys_files_workflows,
         migrate_member_roles_to_rbac,
         migrate_oss,
         migration_data_wizard,
@@ -58,7 +57,6 @@ def init_app(app: DifyApp):
         data_migrate,
         upgrade_db,
         fix_app_site_missing,
-        migrate_legacy_sys_files_workflows,
         migrate_data_for_plugin,
         migrate_dataset_permissions_to_rbac,
         migrate_member_roles_to_rbac,

api/models/workflow.py

@@ -25,10 +25,6 @@ from typing_extensions import deprecated
 
 from core.trigger.constants import TRIGGER_PLUGIN_NODE_TYPE
 from core.workflow.human_input_adapter import adapt_node_config_for_graph
-from core.workflow.legacy_system_files import (
-    migrate_legacy_sys_files_graph_with_result,
-    serialized_graph_may_contain_legacy_sys_files,
-)
 from core.workflow.nodes.human_input.pause_reason import (
     HumanInputRequired,
 )
@@ -329,39 +325,7 @@ class Workflow(Base):  # bug
         # Currently, the following functions / methods would mutate the returned dict:
         #
         # - `_get_graph_and_variable_pool_for_single_node_run`.
-        if not self.graph:
-            return {}
-
-        graph = json.loads(self.graph)
-        if not self._supports_legacy_sys_files_compatibility() or not serialized_graph_may_contain_legacy_sys_files(
-            self.graph
-        ):
-            return graph
-
-        # TODO: Remove this load-time compatibility rewrite after all persisted workflows are migrated.
-        return migrate_legacy_sys_files_graph_with_result(graph).graph
-
-    def migrate_legacy_sys_files_graph_in_place(self) -> bool:
-        if (
-            not self.graph
-            or not self._supports_legacy_sys_files_compatibility()
-            or not serialized_graph_may_contain_legacy_sys_files(self.graph)
-        ):
-            return False
-
-        # TODO: Remove this in-place compatibility rewrite after all persisted workflows are migrated.
-        migration_result = migrate_legacy_sys_files_graph_with_result(json.loads(self.graph))
-        if migration_result.changed:
-            self.graph = json.dumps(migration_result.graph)
-        return migration_result.changed
-
-    def _supports_legacy_sys_files_compatibility(self) -> bool:
-        return self.type in {
-            WorkflowType.WORKFLOW,
-            WorkflowType.CHAT,
-            WorkflowType.WORKFLOW.value,
-            WorkflowType.CHAT.value,
-        }
+        return json.loads(self.graph) if self.graph else {}
 
     def get_node_config_by_id(self, node_id: str) -> NodeConfigDict:
         """Extract a node configuration from the workflow graph by node ID.
@@ -523,7 +487,7 @@ class Workflow(Base):  # bug
             "memory":
               {
                 "window": { "enabled": false, "size": 10 },
-                "query_prompt_template": "{{#sys.query#}}\n\n{{#userinput.files#}}",
+                "query_prompt_template": "{{#sys.query#}}\n\n{{#sys.files#}}",
                 "role_prefix": { "user": "", "assistant": "" },
               },
             "selected": false,
@@ -1556,7 +1520,7 @@ class ConversationVariable(TypeBase):
         return variable_factory.build_conversation_variable_from_mapping(mapping)
 
 
-# TODO: Remove file-system-variable editability after all persisted workflows are migrated.
+# Only `sys.query` and `sys.files` could be modified.
 _EDITABLE_SYSTEM_VARIABLE = frozenset(("query", "files"))
 
 

api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dify-api"
-version = "1.16.1"
+version = "1.16.0"
 requires-python = "~=3.12.0"
 
 dependencies = [

api/services/app_generate_service.py

@@ -488,7 +488,7 @@ class AppGenerateService:
         )
 
     @classmethod
-    def get_workflow(
+    def _get_workflow(
         cls,
         app_model: App,
         invoke_from: InvokeFrom,
@@ -533,17 +533,6 @@ class AppGenerateService:
 
         return workflow
 
-    @classmethod
-    def _get_workflow(
-        cls,
-        app_model: App,
-        invoke_from: InvokeFrom,
-        workflow_id: str | None = None,
-        *,
-        session: Session,
-    ) -> Workflow:
-        return cls.get_workflow(app_model, invoke_from, workflow_id, session=session)
-
     @classmethod
     def get_response_generator(
         cls,

api/services/feature_service.py

@@ -1,8 +1,6 @@
-import logging
-from collections.abc import Mapping
 from enum import StrEnum
 
-from pydantic import BaseModel, ConfigDict, Field, ValidationError
+from pydantic import BaseModel, ConfigDict, Field
 
 from configs import dify_config
 from constants.dsl_version import CURRENT_APP_DSL_VERSION
@@ -12,8 +10,6 @@ from enums.hosted_provider import HostedTrialProvider
 from services.billing_service import BillingInfo, BillingService
 from services.enterprise.enterprise_service import EnterpriseService
 
-logger = logging.getLogger(__name__)
-
 
 class FeatureResponseModel(BaseModel):
     model_config = ConfigDict(json_schema_serialization_defaults_required=True, protected_namespaces=())
@@ -135,13 +131,6 @@ class PluginInstallationPermissionModel(FeatureResponseModel):
     restrict_to_marketplace_only: bool = False
 
 
-class _EnterprisePluginInstallationPermission(BaseModel):
-    model_config = ConfigDict(extra="ignore")
-
-    plugin_installation_scope: PluginInstallationScope = Field(alias="pluginInstallationScope")
-    restrict_to_marketplace_only: bool = Field(alias="restrictToMarketplaceOnly", strict=True)
-
-
 class FeatureModel(FeatureResponseModel):
     billing: BillingModel = BillingModel()
     education: EducationModel = EducationModel()
@@ -296,14 +285,6 @@ class FeatureService:
         """Return whether Enterprise plugin credential policies must be enforced."""
         return dify_config.ENTERPRISE_ENABLED
 
-    @classmethod
-    def get_plugin_installation_permission(cls) -> PluginInstallationPermissionModel:
-        """Resolve the validated deployment-wide plugin installation policy."""
-        if not dify_config.ENTERPRISE_ENABLED:
-            return PluginInstallationPermissionModel()
-
-        return cls._resolve_plugin_installation_permission(EnterpriseService.get_info())
-
     @classmethod
     def get_license(cls) -> LicenseModel:
         """Return full license detail. Enterprise-only; requires an authenticated caller.
@@ -471,33 +452,6 @@ class FeatureService:
                 )
         return license_model
 
-    @classmethod
-    def _resolve_plugin_installation_permission(
-        cls, enterprise_info: Mapping[str, object]
-    ) -> PluginInstallationPermissionModel:
-        if "PluginInstallationPermission" not in enterprise_info:
-            return PluginInstallationPermissionModel()
-
-        try:
-            permission = _EnterprisePluginInstallationPermission.model_validate(
-                enterprise_info["PluginInstallationPermission"]
-            )
-        except ValidationError as exc:
-            # Do not attach the exception because it may contain raw Enterprise configuration values.
-            logger.error(  # noqa: TRY400
-                "Invalid Enterprise plugin installation permission; denying all plugin installations: %s",
-                exc.errors(include_input=False),
-            )
-            return PluginInstallationPermissionModel(
-                plugin_installation_scope=PluginInstallationScope.NONE,
-                restrict_to_marketplace_only=True,
-            )
-
-        return PluginInstallationPermissionModel(
-            plugin_installation_scope=permission.plugin_installation_scope,
-            restrict_to_marketplace_only=permission.restrict_to_marketplace_only,
-        )
-
     @classmethod
     def _fulfill_params_from_enterprise(cls, features: SystemFeatureModel):
         enterprise_info = EnterpriseService.get_info()
@@ -545,4 +499,11 @@ class FeatureService:
                 status=LicenseStatus(license_info.get("status", LicenseStatus.INACTIVE))
             )
 
-        features.plugin_installation_permission = cls._resolve_plugin_installation_permission(enterprise_info)
+        if "PluginInstallationPermission" in enterprise_info:
+            plugin_installation_info = enterprise_info["PluginInstallationPermission"]
+            features.plugin_installation_permission.plugin_installation_scope = plugin_installation_info[
+                "pluginInstallationScope"
+            ]
+            features.plugin_installation_permission.restrict_to_marketplace_only = plugin_installation_info[
+                "restrictToMarketplaceOnly"
+            ]

api/services/workflow/workflow_converter.py

@@ -18,7 +18,6 @@ from core.app.apps.completion.app_config_manager import CompletionAppConfigManag
 from core.helper import encrypter
 from core.prompt.simple_prompt_transform import SimplePromptTransform
 from core.prompt.utils.prompt_template_parser import PromptTemplateParser
-from core.workflow.variable_prefixes import USER_INPUT_VARIABLE_NODE_ID
 from events.app_event import app_was_created
 from graphon.file import FileUploadConfig
 from graphon.model_runtime.entities.llm_entities import LLMMode
@@ -598,7 +597,7 @@ class WorkflowConverter:
                 },
                 "vision": {
                     "enabled": file_upload is not None,
-                    "variable_selector": [USER_INPUT_VARIABLE_NODE_ID, "files"] if file_upload is not None else None,
+                    "variable_selector": ["sys", "files"] if file_upload is not None else None,
                     "configs": {"detail": file_upload.image_config.detail}
                     if file_upload is not None and file_upload.image_config is not None
                     else None,

api/services/workflow_service.py

@@ -6,10 +6,8 @@ from collections.abc import Callable, Generator, Mapping, Sequence
 from dataclasses import dataclass
 from typing import Any, cast
 
-from sqlalchemy import exists, inspect, select, update
-from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy import exists, select
 from sqlalchemy.orm import Session, sessionmaker
-from sqlalchemy.orm.attributes import set_committed_value
 
 from configs import dify_config
 from core.app.apps.advanced_chat.app_config_manager import AdvancedChatAppConfigManager
@@ -145,8 +143,6 @@ from .human_input_delivery_test_service import (
 from .workflow_draft_variable_service import DraftVariableSaver, DraftVarLoader, WorkflowDraftVariableService
 from .workflow_restore import apply_published_workflow_snapshot_to_draft
 
-logger = logging.getLogger(__name__)
-
 _file_access_controller = DatabaseFileAccessController()
 
 
@@ -159,7 +155,6 @@ class WorkflowService:
         """Initialize WorkflowService with repository dependencies."""
         if session_maker is None:
             session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
-        self._session_maker = session_maker
         self._node_execution_service_repo = DifyAPIRepositoryFactory.create_api_workflow_node_execution_repository(
             session_maker
         )
@@ -216,7 +211,7 @@ class WorkflowService:
         )
 
         # return draft workflow
-        return self._persist_legacy_sys_files_migration_on_load(workflow)
+        return workflow
 
     def get_published_workflow_by_id(self, app_model: App, workflow_id: str, *, session: Session) -> Workflow | None:
         """
@@ -241,7 +236,6 @@ class WorkflowService:
                 f"Cannot use draft workflow version. Workflow ID: {workflow_id}. "
                 f"Please use a published workflow version or leave workflow_id empty."
             )
-        self._persist_legacy_sys_files_migration_on_load(workflow)
         return workflow
 
     def get_published_workflow(self, app_model: App, *, session: Session) -> Workflow | None:
@@ -265,53 +259,6 @@ class WorkflowService:
             .limit(1)
         )
 
-        return self._persist_legacy_sys_files_migration_on_load(workflow)
-
-    def _persist_legacy_sys_files_migration_on_load(self, workflow: Workflow | None) -> Workflow | None:
-        """Persist a load-time graph rewrite without joining or dirtying the caller's transaction."""
-
-        if workflow is None:
-            return None
-        if inspect(workflow, raiseerr=False) is None:
-            return workflow
-
-        # TODO: Remove this load-time persistence path after the historical workflow migration is complete.
-        original_graph = workflow.graph
-        if not workflow.migrate_legacy_sys_files_graph_in_place():
-            return workflow
-
-        migrated_graph = workflow.graph
-        try:
-            with self._session_maker.begin() as session:
-                result = session.execute(
-                    update(Workflow)
-                    .where(
-                        Workflow.id == workflow.id,
-                        Workflow.tenant_id == workflow.tenant_id,
-                        Workflow.graph == original_graph,
-                    )
-                    .values(graph=migrated_graph)
-                )
-                if getattr(result, "rowcount", None) == 0:
-                    logger.warning(
-                        "Skipped persisting legacy sys.files workflow migration because the workflow changed "
-                        "concurrently, "
-                        "workflow_id=%s tenant_id=%s",
-                        workflow.id,
-                        workflow.tenant_id,
-                    )
-        except SQLAlchemyError:
-            logger.warning(
-                "Failed to persist legacy sys.files workflow migration, workflow_id=%s tenant_id=%s",
-                workflow.id,
-                workflow.tenant_id,
-                exc_info=True,
-            )
-        finally:
-            # The conditional update owns persistence. Mark the caller's instance clean so its later flush cannot
-            # overwrite a concurrent workflow edit with the compatibility rewrite.
-            set_committed_value(workflow, "graph", migrated_graph)
-
         return workflow
 
     def get_accessible_app_ids(self, app_ids: Sequence[str], tenant_id: str, *, session: Session) -> set[str]:

api/tests/fixtures/workflow/basic_chatflow.yml

@@ -61,7 +61,7 @@ workflow:
           query_prompt_template: '{{#sys.query#}}
 
 
-            {{#userinput.files#}}'
+            {{#sys.files#}}'
           window:
             enabled: false
             size: 10

api/tests/fixtures/workflow/multilingual_parallel_llm_streaming_workflow.yml

@@ -162,7 +162,7 @@ workflow:
           query_prompt_template: '{{#sys.query#}}
 
 
-            {{#userinput.files#}}'
+            {{#sys.files#}}'
           role_prefix:
             assistant: ''
             user: ''
@@ -207,7 +207,7 @@ workflow:
           query_prompt_template: '{{#sys.query#}}
 
 
-            {{#userinput.files#}}'
+            {{#sys.files#}}'
           role_prefix:
             assistant: ''
             user: ''

api/tests/fixtures/workflow/test_complex_branch.yml

@@ -178,7 +178,7 @@ workflow:
           query_prompt_template: '{{#sys.query#}}
 
 
-            {{#userinput.files#}}'
+            {{#sys.files#}}'
           role_prefix:
             assistant: ''
             user: ''

api/tests/test_containers_integration_tests/controllers/console/datasets/test_data_source.py

@@ -1,85 +1,494 @@
-"""Integration coverage for Notion page bindings backed by persisted documents."""
+"""Testcontainers integration tests for controllers.console.datasets.data_source endpoints."""
 
-from inspect import unwrap
-from unittest.mock import MagicMock, patch
+from __future__ import annotations
+
+import inspect
+from collections.abc import Iterator
+from datetime import UTC, datetime
+from unittest.mock import MagicMock, PropertyMock, patch
 from uuid import uuid4
 
+import pytest
 from flask import Flask
 from sqlalchemy.orm import Session
+from werkzeug.exceptions import NotFound
 
-from controllers.console.datasets.data_source import DataSourceNotionListApi
-from models import Account
+from controllers.console.datasets import data_source
+from controllers.console.datasets.data_source import (
+    DataSourceApi,
+    DataSourceNotionDatasetSyncApi,
+    DataSourceNotionDocumentSyncApi,
+    DataSourceNotionIndexingEstimateApi,
+    DataSourceNotionListApi,
+    DataSourceNotionPreviewApi,
+)
+from core.rag.index_processor.constant.index_type import IndexStructureType
+from models import Account, DataSourceOauthBinding
 from models.dataset import Document
 from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
 
 
-def test_notion_page_is_marked_bound_from_persisted_document(
-    flask_app_with_containers: Flask,
-    db_session_with_containers: Session,
-) -> None:
-    tenant_id = str(uuid4())
-    dataset_id = str(uuid4())
-    account = Account(name="Test User", email="user@example.com")
-    account.id = str(uuid4())
-    document = Document(
-        tenant_id=tenant_id,
-        dataset_id=dataset_id,
-        position=1,
-        data_source_type=DataSourceType.NOTION_IMPORT,
-        data_source_info='{"notion_page_id": "page-1"}',
-        batch=f"batch-{uuid4()}",
-        name="Notion Page",
-        created_from=DocumentCreatedFrom.WEB,
-        created_by=str(uuid4()),
-        indexing_status=IndexingStatus.COMPLETED,
-        enabled=True,
-    )
-    db_session_with_containers.add(document)
-    db_session_with_containers.commit()
-    runtime = MagicMock(
-        get_online_document_pages=lambda **_kwargs: iter(
-            [
-                MagicMock(
-                    result=[
-                        MagicMock(
-                            workspace_id="workspace-1",
-                            workspace_name="Workspace",
-                            workspace_icon=None,
-                            pages=[
-                                MagicMock(
-                                    page_id="page-1",
-                                    page_name="Page",
-                                    type="page",
-                                    parent_id="parent",
-                                    page_icon=None,
-                                )
-                            ],
-                        )
-                    ]
-                )
-            ]
-        ),
-        datasource_provider_type=lambda: None,
-    )
+@pytest.fixture
+def current_user() -> Account:
+    account = Account(name="Test User", email="u1@example.com")
+    account.id = "u1"
+    return account
 
-    with (
-        flask_app_with_containers.test_request_context(f"/?credential_id=c1&dataset_id={dataset_id}"),
-        patch(
-            "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
-            return_value={"token": "token"},
-        ),
-        patch(
-            "controllers.console.datasets.data_source.DatasetService.get_dataset",
-            return_value=MagicMock(data_source_type="notion_import"),
-        ),
-        patch(
-            "core.datasource.datasource_manager.DatasourceManager.get_datasource_runtime",
-            return_value=runtime,
-        ),
+
+@pytest.fixture
+def mock_engine() -> Iterator[None]:
+    with patch.object(
+        type(data_source.db),
+        "engine",
+        new_callable=PropertyMock,
+        return_value=MagicMock(),
     ):
-        response, status = unwrap(DataSourceNotionListApi().get)(
-            DataSourceNotionListApi(), db_session_with_containers, tenant_id, account
+        yield
+
+
+class TestDataSourceApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_get_success(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.get)
+
+        binding = DataSourceOauthBinding(
+            tenant_id="tenant-1",
+            access_token="token",
+            provider="notion",
+            source_info={
+                "workspace_name": "Workspace",
+                "workspace_id": "workspace-1",
+                "workspace_icon": None,
+                "total": 1,
+                "pages": [
+                    {
+                        "page_id": "page-1",
+                        "page_name": "Page",
+                        "page_icon": {"type": "emoji", "emoji": "P", "url": None},
+                        "parent_id": "parent-1",
+                        "type": "page",
+                    }
+                ],
+            },
+        )
+        binding.id = "b1"
+        binding.created_at = datetime(2026, 5, 25, 1, 2, 3, tzinfo=UTC)
+        binding.disabled = False
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.db.session.scalars",
+                return_value=MagicMock(all=lambda: [binding]),
+            ),
+        ):
+            response, status = method(api, "tenant-1")
+
+        assert status == 200
+        assert response["data"][0] == {
+            "id": "b1",
+            "provider": "notion",
+            "created_at": 1779670923,
+            "is_bound": True,
+            "disabled": False,
+            "source_info": {
+                "workspace_name": "Workspace",
+                "workspace_id": "workspace-1",
+                "workspace_icon": None,
+                "pages": [
+                    {
+                        "page_name": "Page",
+                        "page_id": "page-1",
+                        "page_icon": {"type": "emoji", "url": None, "emoji": "P"},
+                        "parent_id": "parent-1",
+                        "type": "page",
+                    }
+                ],
+                "total": 1,
+            },
+            "link": "http://localhost/console/api/oauth/data-source/notion",
+        }
+
+    def test_get_no_bindings(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.db.session.scalars",
+                return_value=MagicMock(all=lambda: []),
+            ),
+        ):
+            response, status = method(api, "tenant-1")
+
+        assert status == 200
+        assert response["data"] == []
+
+    def test_patch_enable_binding(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.patch)
+
+        binding = MagicMock(id="b1", disabled=True)
+        session = MagicMock()
+        session.scalar.return_value = binding
+
+        with app.test_request_context("/"):
+            response, status = method(api, session, "tenant-1", "b1", "enable")
+
+        assert status == 200
+        assert binding.disabled is False
+
+    def test_patch_disable_binding(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.patch)
+
+        binding = MagicMock(id="b1", disabled=False)
+        session = MagicMock()
+        session.scalar.return_value = binding
+
+        with app.test_request_context("/"):
+            response, status = method(api, session, "tenant-1", "b1", "disable")
+
+        assert status == 200
+        assert binding.disabled is True
+
+    def test_patch_binding_not_found(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.patch)
+        session = MagicMock()
+        session.scalar.return_value = None
+
+        with app.test_request_context("/"):
+            with pytest.raises(NotFound):
+                method(api, session, "tenant-1", "b1", "enable")
+
+    def test_patch_enable_already_enabled(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.patch)
+
+        binding = MagicMock(id="b1", disabled=False)
+        session = MagicMock()
+        session.scalar.return_value = binding
+
+        with app.test_request_context("/"):
+            with pytest.raises(ValueError):
+                method(api, session, "tenant-1", "b1", "enable")
+
+    def test_patch_disable_already_disabled(self, app: Flask) -> None:
+        api = DataSourceApi()
+        method = inspect.unwrap(api.patch)
+
+        binding = MagicMock(id="b1", disabled=True)
+        session = MagicMock()
+        session.scalar.return_value = binding
+
+        with app.test_request_context("/"):
+            with pytest.raises(ValueError):
+                method(api, session, "tenant-1", "b1", "disable")
+
+
+class TestDataSourceNotionListApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_get_credential_not_found(self, app: Flask, current_user: Account) -> None:
+        api = DataSourceNotionListApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/?credential_id=c1"),
+            patch(
+                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
+                return_value=None,
+            ),
+        ):
+            with pytest.raises(NotFound):
+                method(api, MagicMock(), "tenant-1", current_user)
+
+    def test_get_success_no_dataset_id(self, app: Flask, current_user: Account, mock_engine: None) -> None:
+        api = DataSourceNotionListApi()
+        method = inspect.unwrap(api.get)
+
+        page = MagicMock(
+            page_id="p1",
+            page_name="Page 1",
+            type="page",
+            parent_id="parent",
+            page_icon=None,
         )
 
-    assert status == 200
-    assert response["notion_info"][0]["pages"][0]["is_bound"] is True
+        online_document_message = MagicMock(
+            result=[
+                MagicMock(
+                    workspace_id="w1",
+                    workspace_name="My Workspace",
+                    workspace_icon="icon",
+                    pages=[page],
+                )
+            ]
+        )
+
+        with (
+            app.test_request_context("/?credential_id=c1"),
+            patch(
+                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
+                return_value={"token": "t"},
+            ),
+            patch(
+                "core.datasource.datasource_manager.DatasourceManager.get_datasource_runtime",
+                return_value=MagicMock(
+                    get_online_document_pages=lambda **kw: iter([online_document_message]),
+                    datasource_provider_type=lambda: None,
+                ),
+            ),
+        ):
+            response, status = method(api, MagicMock(), "tenant-1", current_user)
+
+        assert status == 200
+
+    def test_get_success_with_dataset_id(
+        self, app: Flask, current_user: Account, mock_engine: None, db_session_with_containers: Session
+    ) -> None:
+        api = DataSourceNotionListApi()
+        method = inspect.unwrap(api.get)
+        tenant_id = str(uuid4())
+        dataset_id = str(uuid4())
+
+        page = MagicMock(
+            page_id="p1",
+            page_name="Page 1",
+            type="page",
+            parent_id="parent",
+            page_icon=None,
+        )
+
+        online_document_message = MagicMock(
+            result=[
+                MagicMock(
+                    workspace_id="w1",
+                    workspace_name="My Workspace",
+                    workspace_icon="icon",
+                    pages=[page],
+                )
+            ]
+        )
+
+        dataset = MagicMock(data_source_type="notion_import")
+        document = Document(
+            tenant_id=tenant_id,
+            dataset_id=dataset_id,
+            position=1,
+            data_source_type=DataSourceType.NOTION_IMPORT,
+            data_source_info='{"notion_page_id": "p1"}',
+            batch=f"batch-{uuid4()}",
+            name="Notion Page",
+            created_from=DocumentCreatedFrom.WEB,
+            created_by=str(uuid4()),
+            indexing_status=IndexingStatus.COMPLETED,
+            enabled=True,
+        )
+        db_session_with_containers.add(document)
+        db_session_with_containers.commit()
+
+        with (
+            app.test_request_context(f"/?credential_id=c1&dataset_id={dataset_id}"),
+            patch(
+                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
+                return_value={"token": "t"},
+            ),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=dataset,
+            ),
+            patch(
+                "core.datasource.datasource_manager.DatasourceManager.get_datasource_runtime",
+                return_value=MagicMock(
+                    get_online_document_pages=lambda **kw: iter([online_document_message]),
+                    datasource_provider_type=lambda: None,
+                ),
+            ),
+        ):
+            response, status = method(api, db_session_with_containers, tenant_id, current_user)
+
+        assert status == 200
+
+    def test_get_invalid_dataset_type(self, app: Flask, current_user: Account, mock_engine: None) -> None:
+        api = DataSourceNotionListApi()
+        method = inspect.unwrap(api.get)
+
+        dataset = MagicMock(data_source_type="other_type")
+
+        with (
+            app.test_request_context("/?credential_id=c1&dataset_id=ds1"),
+            patch(
+                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
+                return_value={"token": "t"},
+            ),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=dataset,
+            ),
+        ):
+            with pytest.raises(ValueError):
+                method(api, MagicMock(), "tenant-1", current_user)
+
+
+class TestDataSourceNotionPreviewApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_get_preview_success(self, app: Flask) -> None:
+        api = DataSourceNotionPreviewApi()
+        method = inspect.unwrap(api.get)
+
+        extractor = MagicMock(extract=lambda: [MagicMock(page_content="hello")])
+
+        with (
+            app.test_request_context("/?credential_id=c1"),
+            patch(
+                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
+                return_value={"integration_secret": "t"},
+            ),
+            patch(
+                "controllers.console.datasets.data_source.NotionExtractor",
+                return_value=extractor,
+            ),
+        ):
+            response, status = method(api, "tenant-1", "p1", "page")
+
+        assert status == 200
+
+
+class TestDataSourceNotionIndexingEstimateApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_post_indexing_estimate_success(self, app: Flask) -> None:
+        api = DataSourceNotionIndexingEstimateApi()
+        method = inspect.unwrap(api.post)
+
+        empty_rules: dict[str, object] = {}
+        payload: dict[str, object] = {
+            "notion_info_list": [
+                {
+                    "workspace_id": "w1",
+                    "credential_id": "c1",
+                    "pages": [{"page_id": "p1", "type": "page"}],
+                }
+            ],
+            "process_rule": {"rules": empty_rules},
+            "doc_form": IndexStructureType.PARAGRAPH_INDEX,
+            "doc_language": "English",
+        }
+
+        with (
+            app.test_request_context("/", method="POST", json=payload, headers={"Content-Type": "application/json"}),
+            patch(
+                "controllers.console.datasets.data_source.DocumentService.estimate_args_validate",
+            ),
+            patch(
+                "controllers.console.datasets.data_source.IndexingRunner.indexing_estimate",
+                return_value=MagicMock(model_dump=lambda: {"total_pages": 1}),
+            ),
+        ):
+            response, status = method(api, MagicMock(), "tenant-1")
+
+        assert status == 200
+
+
+class TestDataSourceNotionDatasetSyncApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_get_success(self, app: Flask) -> None:
+        api = DataSourceNotionDatasetSyncApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=MagicMock(),
+            ),
+            patch(
+                "controllers.console.datasets.data_source.DocumentService.get_document_by_dataset_id",
+                return_value=[MagicMock(id="d1")],
+            ),
+            patch(
+                "controllers.console.datasets.data_source.document_indexing_sync_task.delay",
+                return_value=None,
+            ),
+        ):
+            response, status = method(api, MagicMock(), "ds-1")
+
+        assert status == 200
+
+    def test_get_dataset_not_found(self, app: Flask) -> None:
+        api = DataSourceNotionDatasetSyncApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=None,
+            ),
+        ):
+            with pytest.raises(NotFound):
+                method(api, MagicMock(), "ds-1")
+
+
+class TestDataSourceNotionDocumentSyncApi:
+    @pytest.fixture
+    def app(self, flask_app_with_containers: Flask) -> Flask:
+        return flask_app_with_containers
+
+    def test_get_success(self, app: Flask) -> None:
+        api = DataSourceNotionDocumentSyncApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=MagicMock(),
+            ),
+            patch(
+                "controllers.console.datasets.data_source.DocumentService.get_document",
+                return_value=MagicMock(),
+            ),
+            patch(
+                "controllers.console.datasets.data_source.document_indexing_sync_task.delay",
+                return_value=None,
+            ),
+        ):
+            response, status = method(api, MagicMock(), "ds-1", "doc-1")
+
+        assert status == 200
+
+    def test_get_document_not_found(self, app: Flask) -> None:
+        api = DataSourceNotionDocumentSyncApi()
+        method = inspect.unwrap(api.get)
+
+        with (
+            app.test_request_context("/"),
+            patch(
+                "controllers.console.datasets.data_source.DatasetService.get_dataset",
+                return_value=MagicMock(),
+            ),
+            patch(
+                "controllers.console.datasets.data_source.DocumentService.get_document",
+                return_value=None,
+            ),
+        ):
+            with pytest.raises(NotFound):
+                method(api, MagicMock(), "ds-1", "doc-1")

api/tests/test_containers_integration_tests/services/test_messages_clean_service.py

@@ -4,7 +4,7 @@ import datetime
 import json
 import uuid
 from decimal import Decimal
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
@@ -1172,8 +1172,65 @@ class TestMessagesCleanServiceIntegration:
         # Verify all messages were deleted
         assert db_session_with_containers.query(Message).where(Message.id.in_(msg_ids)).count() == 0
 
+    def test_from_time_range_validation(self):
+        """Test that from_time_range raises ValueError for invalid inputs."""
+        policy = MagicMock(spec=BillingDisabledPolicy)
+        now = datetime.datetime.now()
+
+        with pytest.raises(ValueError, match="start_from .* must be less than end_before"):
+            MessagesCleanService.from_time_range(policy, now, now)
+
+        with pytest.raises(ValueError, match="batch_size .* must be greater than 0"):
+            MessagesCleanService.from_time_range(policy, now - datetime.timedelta(days=1), now, batch_size=0)
+
+    def test_from_time_range_success(self):
+        """Test that from_time_range creates a service with correct parameters."""
+        policy = MagicMock(spec=BillingDisabledPolicy)
+        start = datetime.datetime(2024, 1, 1)
+        end = datetime.datetime(2024, 2, 1)
+
+        service = MessagesCleanService.from_time_range(policy, start, end)
+        assert service._start_from == start
+        assert service._end_before == end
+
+    def test_from_days_validation(self):
+        """Test that from_days raises ValueError for invalid inputs."""
+        policy = MagicMock(spec=BillingDisabledPolicy)
+
+        with pytest.raises(ValueError, match="days .* must be greater than or equal to 0"):
+            MessagesCleanService.from_days(policy, days=-1)
+
+        with pytest.raises(ValueError, match="batch_size .* must be greater than 0"):
+            MessagesCleanService.from_days(policy, days=30, batch_size=0)
+
+    def test_from_days_success(self):
+        """Test that from_days creates a service with correct parameters."""
+        policy = MagicMock(spec=BillingDisabledPolicy)
+
+        with patch("services.retention.conversation.messages_clean_service.naive_utc_now") as mock_now:
+            fixed_now = datetime.datetime(2024, 6, 1)
+            mock_now.return_value = fixed_now
+
+            service = MessagesCleanService.from_days(policy, days=10)
+            assert service._start_from is None
+            assert service._end_before == fixed_now - datetime.timedelta(days=10)
+
     def test_batch_delete_message_relations_empty(self, db_session_with_containers: Session):
         """Test that batch_delete_message_relations with empty list does nothing."""
         # Get execute call count before
         MessagesCleanService._batch_delete_message_relations(db_session_with_containers, [])
         # No exception means success — empty list is a no-op
+
+    def test_run_calls_clean_messages(self):
+        """Test that run() delegates to _clean_messages_by_time_range."""
+        policy = MagicMock(spec=BillingDisabledPolicy)
+        service = MessagesCleanService(
+            policy=policy,
+            end_before=datetime.datetime.now(),
+            batch_size=10,
+        )
+        with patch.object(service, "_clean_messages_by_time_range") as mock_clean:
+            mock_clean.return_value = {"total_deleted": 5}
+            result = service.run()
+            assert result == {"total_deleted": 5}
+            mock_clean.assert_called_once()

api/tests/test_containers_integration_tests/services/test_oauth_server_service.py

@@ -1,20 +1,16 @@
-"""Unit tests for OAuthServerService with SQLite-backed database access."""
+"""Testcontainers integration tests for OAuthServerService."""
 
 from __future__ import annotations
 
 import uuid
-from collections.abc import Iterator
 from typing import cast
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
-from flask import Flask
-from sqlalchemy import Engine
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest
 
-from models.engine import db
 from models.model import OAuthProviderApp
 from services.oauth_server import (
     OAUTH_ACCESS_TOKEN_EXPIRES_IN,
@@ -27,24 +23,10 @@ from services.oauth_server import (
 )
 
 
-@pytest.fixture
-def oauth_db() -> Iterator[Session]:
-    """Provide the production database extension with an isolated SQLite provider table."""
-    app = Flask(__name__)
-    app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
-    db.init_app(app)
-
-    with app.app_context():
-        OAuthProviderApp.__table__.create(db.engine)
-        with Session(db.engine, expire_on_commit=False) as session:
-            yield session
-
-
 class TestOAuthServerServiceGetProviderApp:
-    """Verify provider lookup against a real SQLAlchemy database."""
+    """DB-backed tests for get_oauth_provider_app."""
 
-    def test_get_oauth_provider_app_returns_app_when_exists(self, oauth_db: Session) -> None:
-        client_id = f"client-{uuid4()}"
+    def _create_oauth_provider_app(self, db_session_with_containers: Session, *, client_id: str) -> OAuthProviderApp:
         app = OAuthProviderApp(
             app_icon="icon.png",
             client_id=client_id,
@@ -53,30 +35,35 @@ class TestOAuthServerServiceGetProviderApp:
             redirect_uris=["https://example.com/callback"],
             scope="read",
         )
-        oauth_db.add(app)
-        oauth_db.commit()
+        db_session_with_containers.add(app)
+        db_session_with_containers.commit()
+        return app
+
+    def test_get_oauth_provider_app_returns_app_when_exists(self, db_session_with_containers: Session):
+        client_id = f"client-{uuid4()}"
+        created = self._create_oauth_provider_app(db_session_with_containers, client_id=client_id)
 
         result = OAuthServerService.get_oauth_provider_app(client_id)
 
         assert result is not None
         assert result.client_id == client_id
-        assert result.id == app.id
+        assert result.id == created.id
 
-    def test_get_oauth_provider_app_returns_none_when_not_exists(self, oauth_db: Session) -> None:
+    def test_get_oauth_provider_app_returns_none_when_not_exists(self, db_session_with_containers: Session):
         result = OAuthServerService.get_oauth_provider_app(f"nonexistent-{uuid4()}")
 
         assert result is None
 
 
 class TestOAuthServerServiceTokenOperations:
-    """Verify Redis-backed token signing and validation branches."""
+    """Redis-backed tests for token sign/validate operations."""
 
     @pytest.fixture
     def mock_redis(self):
         with patch("services.oauth_server.redis_client") as mock:
             yield mock
 
-    def test_sign_authorization_code_stores_and_returns_code(self, mock_redis) -> None:
+    def test_sign_authorization_code_stores_and_returns_code(self, mock_redis):
         deterministic_uuid = uuid.UUID("00000000-0000-0000-0000-000000000111")
         with patch("services.oauth_server.uuid.uuid4", return_value=deterministic_uuid):
             code = OAuthServerService.sign_oauth_authorization_code("client-1", "user-1")
@@ -88,7 +75,7 @@ class TestOAuthServerServiceTokenOperations:
             ex=600,
         )
 
-    def test_sign_access_token_raises_bad_request_for_invalid_code(self, mock_redis) -> None:
+    def test_sign_access_token_raises_bad_request_for_invalid_code(self, mock_redis):
         mock_redis.get.return_value = None
 
         with pytest.raises(BadRequest, match="invalid code"):
@@ -98,13 +85,14 @@ class TestOAuthServerServiceTokenOperations:
                 client_id="client-1",
             )
 
-    def test_sign_access_token_issues_tokens_for_valid_code(self, mock_redis) -> None:
+    def test_sign_access_token_issues_tokens_for_valid_code(self, mock_redis):
         token_uuids = [
             uuid.UUID("00000000-0000-0000-0000-000000000201"),
             uuid.UUID("00000000-0000-0000-0000-000000000202"),
         ]
         with patch("services.oauth_server.uuid.uuid4", side_effect=token_uuids):
             mock_redis.get.return_value = b"user-1"
+
             access_token, refresh_token = OAuthServerService.sign_oauth_access_token(
                 grant_type=OAuthGrantType.AUTHORIZATION_CODE,
                 code="code-1",
@@ -126,7 +114,7 @@ class TestOAuthServerServiceTokenOperations:
             ex=OAUTH_REFRESH_TOKEN_EXPIRES_IN,
         )
 
-    def test_sign_access_token_raises_bad_request_for_invalid_refresh_token(self, mock_redis) -> None:
+    def test_sign_access_token_raises_bad_request_for_invalid_refresh_token(self, mock_redis):
         mock_redis.get.return_value = None
 
         with pytest.raises(BadRequest, match="invalid refresh token"):
@@ -136,10 +124,11 @@ class TestOAuthServerServiceTokenOperations:
                 client_id="client-1",
             )
 
-    def test_sign_access_token_issues_new_token_for_valid_refresh(self, mock_redis) -> None:
+    def test_sign_access_token_issues_new_token_for_valid_refresh(self, mock_redis):
         deterministic_uuid = uuid.UUID("00000000-0000-0000-0000-000000000301")
         with patch("services.oauth_server.uuid.uuid4", return_value=deterministic_uuid):
             mock_redis.get.return_value = b"user-1"
+
             access_token, returned_refresh = OAuthServerService.sign_oauth_access_token(
                 grant_type=OAuthGrantType.REFRESH_TOKEN,
                 refresh_token="refresh-1",
@@ -149,14 +138,14 @@ class TestOAuthServerServiceTokenOperations:
         assert access_token == str(deterministic_uuid)
         assert returned_refresh == "refresh-1"
 
-    def test_sign_access_token_returns_none_for_unknown_grant_type(self, mock_redis) -> None:
+    def test_sign_access_token_returns_none_for_unknown_grant_type(self, mock_redis):
         grant_type = cast(OAuthGrantType, "invalid-grant-type")
 
         result = OAuthServerService.sign_oauth_access_token(grant_type=grant_type, client_id="client-1")
 
         assert result is None
 
-    def test_sign_refresh_token_stores_with_expected_expiry(self, mock_redis) -> None:
+    def test_sign_refresh_token_stores_with_expected_expiry(self, mock_redis):
         deterministic_uuid = uuid.UUID("00000000-0000-0000-0000-000000000401")
         with patch("services.oauth_server.uuid.uuid4", return_value=deterministic_uuid):
             refresh_token = OAuthServerService._sign_oauth_refresh_token("client-2", "user-2")
@@ -168,21 +157,22 @@ class TestOAuthServerServiceTokenOperations:
             ex=OAUTH_REFRESH_TOKEN_EXPIRES_IN,
         )
 
-    def test_validate_access_token_returns_none_when_not_found(self, mock_redis, sqlite_engine: Engine) -> None:
+    def test_validate_access_token_returns_none_when_not_found(self, mock_redis, db_session_with_containers: Session):
         mock_redis.get.return_value = None
+        session = MagicMock()
 
-        with Session(sqlite_engine) as session:
-            result = OAuthServerService.validate_oauth_access_token("client-1", "missing-token", session)
+        result = OAuthServerService.validate_oauth_access_token("client-1", "missing-token", db_session_with_containers)
 
         assert result is None
 
-    def test_validate_access_token_loads_user_when_exists(self, mock_redis, sqlite_engine: Engine) -> None:
+    def test_validate_access_token_loads_user_when_exists(self, mock_redis, db_session_with_containers: Session):
         mock_redis.get.return_value = b"user-88"
         expected_user = MagicMock()
 
-        with Session(sqlite_engine) as session:
-            with patch("services.oauth_server.AccountService.load_user", return_value=expected_user) as mock_load:
-                result = OAuthServerService.validate_oauth_access_token("client-1", "access-token", session)
-                mock_load.assert_called_once_with("user-88", session)
+        with patch("services.oauth_server.AccountService.load_user", return_value=expected_user) as mock_load:
+            result = OAuthServerService.validate_oauth_access_token(
+                "client-1", "access-token", db_session_with_containers
+            )
 
         assert result is expected_user
+        mock_load.assert_called_once_with("user-88", db_session_with_containers)

api/tests/unit_tests/commands/test_fix_app_site_missing.py

@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
 import pytest
 from sqlalchemy.orm import Session
 
-from commands import app_maintenance as app_maintenance_commands
+from commands import system as system_commands
 
 
 def test_fix_app_site_missing_passes_loaded_session_to_signal(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -30,15 +30,15 @@ def test_fix_app_site_missing_passes_loaded_session_to_signal(monkeypatch: pytes
     engine = MagicMock()
     engine.begin.return_value.__enter__.return_value = connection
 
-    monkeypatch.setattr(app_maintenance_commands, "db", SimpleNamespace(engine=engine, session=scoped_session))
+    monkeypatch.setattr(system_commands, "db", SimpleNamespace(engine=engine, session=scoped_session))
     send = MagicMock(side_effect=lambda *_args, **_kwargs: phase_events.append("signal"))
-    monkeypatch.setattr(app_maintenance_commands.app_was_created, "send", send)
+    monkeypatch.setattr(system_commands.app_was_created, "send", send)
 
-    app_maintenance_commands.fix_app_site_missing.callback()
+    system_commands.fix_app_site_missing.callback()
 
     scoped_session.assert_called_once_with()
     scalar.assert_called_once()
-    get.assert_called_once_with(app_maintenance_commands.Tenant, app.tenant_id)
+    get.assert_called_once_with(system_commands.Tenant, app.tenant_id)
     tenant.get_accounts.assert_called_once_with(session=session)
     send.assert_called_once_with(app, account=account, session=session)
     commit.assert_called_once_with()
@@ -62,19 +62,15 @@ def test_fix_app_site_missing_rolls_back_when_signal_fails(monkeypatch: pytest.M
     engine = MagicMock()
     engine.begin.return_value.__enter__.return_value = connection
 
-    monkeypatch.setattr(
-        app_maintenance_commands,
-        "db",
-        SimpleNamespace(engine=engine, session=MagicMock(return_value=session)),
-    )
+    monkeypatch.setattr(system_commands, "db", SimpleNamespace(engine=engine, session=MagicMock(return_value=session)))
 
     def fail_signal(*_args, **_kwargs) -> None:
         phase_events.append("signal")
         raise RuntimeError("failed")
 
-    monkeypatch.setattr(app_maintenance_commands.app_was_created, "send", MagicMock(side_effect=fail_signal))
+    monkeypatch.setattr(system_commands.app_was_created, "send", MagicMock(side_effect=fail_signal))
 
-    app_maintenance_commands.fix_app_site_missing.callback()
+    system_commands.fix_app_site_missing.callback()
 
     session.rollback.assert_called_once_with()
     session.commit.assert_not_called()

api/tests/unit_tests/commands/test_legacy_model_type_migration.py

@@ -6,7 +6,6 @@ import json
 import os
 import threading
 import time
-from collections.abc import Iterator
 from datetime import datetime, timedelta
 from pathlib import Path
 from types import SimpleNamespace
@@ -16,12 +15,9 @@ import pytest
 import sqlalchemy as sa
 from click.testing import CliRunner
 from sqlalchemy.exc import OperationalError
-from sqlalchemy.orm import Session, SessionTransaction, sessionmaker
 
 from graphon.model_runtime.entities.model_entities import ModelType
-from models import Dataset, DatasetPermission, DatasetPermissionEnum
 from models.account import Tenant
-from models.base import TypeBase
 from models.enums import CredentialSourceType
 from models.provider import ProviderModel
 from tests.helpers.legacy_model_type_migration import (
@@ -63,40 +59,6 @@ def command_module():
         )
 
 
-@pytest.fixture
-def rbac_session(sqlite_engine: sa.Engine, monkeypatch: pytest.MonkeyPatch) -> Iterator[Session]:
-    """Bind RBAC command reads to persisted SQLite dataset rows."""
-
-    TypeBase.metadata.create_all(
-        sqlite_engine,
-        tables=[Dataset.__table__, DatasetPermission.__table__],
-    )
-    factory = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
-    monkeypatch.setattr("commands.rbac.session_factory.create_session", factory)
-    with factory() as session:
-        yield session
-
-
-def _persist_dataset(
-    session: Session,
-    *,
-    dataset_id: str = "dataset-1",
-    tenant_id: str = "tenant-1",
-    permission: DatasetPermissionEnum = DatasetPermissionEnum.ONLY_ME,
-    created_by: str = "creator-account-1",
-) -> Dataset:
-    dataset = Dataset(
-        id=dataset_id,
-        tenant_id=tenant_id,
-        name=f"Dataset {dataset_id}",
-        permission=permission,
-        created_by=created_by,
-    )
-    session.add(dataset)
-    session.commit()
-    return dataset
-
-
 def _parse_json_lines(output: io.StringIO) -> list[dict[str, object]]:
     return [json.loads(line) for line in output.getvalue().splitlines() if line.strip()]
 
@@ -401,35 +363,56 @@ def test_dataset_permission_rbac_migration_maps_legacy_permissions_to_enum_scope
 
 def test_dataset_permission_rbac_migration_uses_dataset_creator_as_operator(
     command_module,
-    rbac_session: Session,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     rbac_module = importlib.import_module("commands.rbac")
-    _persist_dataset(rbac_session)
+    dataset_row = SimpleNamespace(
+        id="dataset-1",
+        tenant_id="tenant-1",
+        permission="only_me",
+        created_by="creator-account-1",
+    )
+    execute_results = [[dataset_row], [], []]
     calls: list[dict[str, object]] = []
-    read_transaction_ended = False
+    session_closed = False
+
+    class FakeExecuteResult:
+        def __init__(self, rows: list[object]) -> None:
+            self._rows = rows
+
+        def all(self) -> list[object]:
+            return self._rows
+
+    class FakeSession:
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, traceback) -> None:
+            nonlocal session_closed
+            session_closed = True
+            pass
+
+        def execute(self, stmt):
+            return FakeExecuteResult(execute_results.pop(0))
+
+    class FakeSessionFactory:
+        @staticmethod
+        def create_session() -> FakeSession:
+            return FakeSession()
 
     def fake_replace_whitelist(**kwargs):
-        assert read_transaction_ended is True
+        assert session_closed is True
         calls.append(kwargs)
 
-    def _record_transaction_end(session: Session, transaction: object) -> None:
-        nonlocal read_transaction_ended
-        del transaction
-        if session.get_bind() is rbac_session.get_bind():
-            read_transaction_ended = True
-
-    sa.event.listen(Session, "after_transaction_end", _record_transaction_end)
+    monkeypatch.setattr(rbac_module, "session_factory", FakeSessionFactory)
     monkeypatch.setattr(rbac_module.RBACService.DatasetAccess, "replace_whitelist", fake_replace_whitelist)
-    try:
-        command_module.migrate_dataset_permissions_to_rbac.callback(
-            tenant_id=None,
-            dataset_id=None,
-            batch_size=500,
-            dry_run=False,
-        )
-    finally:
-        sa.event.remove(Session, "after_transaction_end", _record_transaction_end)
+
+    command_module.migrate_dataset_permissions_to_rbac.callback(
+        tenant_id=None,
+        dataset_id=None,
+        batch_size=500,
+        dry_run=False,
+    )
 
     assert calls[0]["tenant_id"] == "tenant-1"
     assert calls[0]["account_id"] == "creator-account-1"
@@ -439,19 +422,41 @@ def test_dataset_permission_rbac_migration_uses_dataset_creator_as_operator(
 
 def test_dataset_permission_rbac_migration_dry_run_outputs_structured_proposed_changes(
     command_module,
-    rbac_session: Session,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     rbac_module = importlib.import_module("commands.rbac")
-    dataset = _persist_dataset(rbac_session, permission=DatasetPermissionEnum.PARTIAL_TEAM)
-    rbac_session.add(
-        DatasetPermission(
-            dataset_id=dataset.id,
-            account_id="member-account-1",
-            tenant_id=dataset.tenant_id,
-        )
+    dataset_row = SimpleNamespace(
+        id="dataset-1",
+        tenant_id="tenant-1",
+        permission="partial_members",
+        created_by="creator-account-1",
     )
-    rbac_session.commit()
+    permission_row = SimpleNamespace(dataset_id="dataset-1", account_id="member-account-1")
+    execute_results = [[dataset_row], [permission_row], []]
+
+    class FakeExecuteResult:
+        def __init__(self, rows: list[object]) -> None:
+            self._rows = rows
+
+        def all(self) -> list[object]:
+            return self._rows
+
+    class FakeSession:
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, traceback) -> None:
+            pass
+
+        def execute(self, stmt):
+            return FakeExecuteResult(execute_results.pop(0))
+
+    class FakeSessionFactory:
+        @staticmethod
+        def create_session() -> FakeSession:
+            return FakeSession()
+
+    monkeypatch.setattr(rbac_module, "session_factory", FakeSessionFactory)
     monkeypatch.setattr(
         rbac_module.RBACService.DatasetAccess,
         "replace_whitelist",
@@ -1301,36 +1306,50 @@ def test_provider_models_processing_uses_same_plan_locking_and_transaction_entry
     begin_calls: list[str] = []
     configure_calls: list[str] = []
 
-    def _record_begin(session: Session, transaction: SessionTransaction) -> None:
-        if session.get_bind() is sqlite_engine and transaction.parent is None:
-            begin_calls.append(current_phase["name"])
+    class _FakeBeginContext:
+        def __init__(self, phase: str) -> None:
+            self._phase = phase
 
-    def _fake_build_plan(self, session: Session, candidate, *, lock_rows: bool):
-        assert session.get_bind() is sqlite_engine
+        def __enter__(self) -> None:
+            begin_calls.append(self._phase)
+
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+    class _FakeSession:
+        def __init__(self, phase: str) -> None:
+            self._phase = phase
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+        def begin(self) -> _FakeBeginContext:
+            return _FakeBeginContext(self._phase)
+
+    def _fake_session_factory(engine: sa.Engine) -> _FakeSession:
+        return _FakeSession(current_phase["name"])
+
+    def _fake_build_plan(self, session, candidate, *, lock_rows: bool):
         lock_rows_seen.append((current_phase["name"], lock_rows))
-        return migration_module._ProviderModelGroupPlan(
-            group_row_ids=[str(candidate.row.id)],
-            winner=None,
-            loser_rows=[],
-        )
+        return SimpleNamespace(group_row_ids=[str(candidate.row.id)], winner=None, loser_rows=[])
 
     def _fake_emit_plan(self, plan, *, session, tx_id: str, business_key: dict[str, object]) -> None:
         return None
 
-    def _fake_configure(self, session: Session) -> None:
-        assert session.get_bind() is sqlite_engine
+    def _fake_configure(self, session) -> None:
         configure_calls.append(current_phase["name"])
 
+    monkeypatch.setattr(migration_module, "_session_factory", _fake_session_factory)
     monkeypatch.setattr(migration_module.Migration, "_build_provider_model_group_plan", _fake_build_plan)
     monkeypatch.setattr(migration_module.Migration, "_emit_provider_model_group_plan", _fake_emit_plan)
     monkeypatch.setattr(migration_module.Migration, "_configure_lock_timeout", _fake_configure)
-    sa.event.listen(Session, "after_transaction_create", _record_begin)
-    try:
-        dry_migration._process_provider_model_group(candidate, business_key)
-        current_phase["name"] = "apply"
-        apply_migration._process_provider_model_group(candidate, business_key)
-    finally:
-        sa.event.remove(Session, "after_transaction_create", _record_begin)
+
+    dry_migration._process_provider_model_group(candidate, business_key)
+    current_phase["name"] = "apply"
+    apply_migration._process_provider_model_group(candidate, business_key)
 
     assert [phase for phase, _ in lock_rows_seen] == ["dry", "apply"]
     assert lock_rows_seen[0][1] == lock_rows_seen[1][1]
@@ -1373,22 +1392,6 @@ def test_process_load_balancing_model_config_row_logs_stacktrace_for_lock_timeou
     sqlite_engine: sa.Engine,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    create_minimal_legacy_model_type_schema(sqlite_engine)
-    created_at = datetime(2025, 1, 1, 12, 0, 0)
-    _insert_load_balancing_model_config(
-        sqlite_engine,
-        row_id="40000000-0000-0000-0000-000000000001",
-        tenant_id="tenant-1",
-        provider_name="openai",
-        model_name="gpt-4o-mini",
-        model_type="text-generation",
-        name="credential",
-        encrypted_config="{}",
-        credential_id="50000000-0000-0000-0000-000000000001",
-        enabled=True,
-        created_at=created_at,
-        updated_at=created_at,
-    )
     output = io.StringIO()
     migration = migration_module.Migration(
         tenant_id="tenant-1",
@@ -1398,18 +1401,37 @@ def test_process_load_balancing_model_config_row_logs_stacktrace_for_lock_timeou
         model_types=(ModelType.LLM,),
         orm_models=(migration_module.LoadBalancingModelConfig,),
     )
-    candidate = migration._load_load_balancing_model_config_candidates(None)[0]
+    candidate = migration_module._RowWithRawModelType(
+        row=SimpleNamespace(id="lb-row-1"),
+        raw_model_type="text-generation",
+        canonical_model_type=ModelType.LLM,
+    )
     lock_timeout_exc = OperationalError("SELECT 1", {}, SimpleNamespace(pgcode="55P03"))
-    transaction_begins = 0
 
-    def _record_begin(session: Session, transaction: SessionTransaction) -> None:
-        nonlocal transaction_begins
-        if session.get_bind() is sqlite_engine and transaction.parent is None:
-            transaction_begins += 1
+    class _FakeBeginContext:
+        def __enter__(self) -> None:
+            return None
+
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+    class _FakeSession:
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+        def begin(self) -> _FakeBeginContext:
+            return _FakeBeginContext()
+
+    def _fake_session_factory(engine: sa.Engine) -> _FakeSession:
+        return _FakeSession()
 
     def _fake_reload(self, session, original_candidate, *, lock_rows: bool):
         raise lock_timeout_exc
 
+    monkeypatch.setattr(migration_module, "_session_factory", _fake_session_factory)
     monkeypatch.setattr(migration_module.Migration, "_configure_lock_timeout", lambda self, session: None)
     monkeypatch.setattr(
         migration_module.Migration,
@@ -1417,22 +1439,17 @@ def test_process_load_balancing_model_config_row_logs_stacktrace_for_lock_timeou
         _fake_reload,
     )
 
-    sa.event.listen(Session, "after_transaction_create", _record_begin)
-    try:
-        migration._process_load_balancing_model_config_row(candidate)
-    finally:
-        sa.event.remove(Session, "after_transaction_create", _record_begin)
+    migration._process_load_balancing_model_config_row(candidate)
 
     lines = _parse_json_lines(output)
     assert len(lines) == 1
     assert lines[0]["event"] == "lock_timeout_skipped"
     attrs = cast(dict[str, object], lines[0]["attrs"])
     assert attrs["table_name"] == "load_balancing_model_configs"
-    assert attrs["id"] == str(candidate.row.id)
+    assert attrs["id"] == "lb-row-1"
     assert attrs["error"] == str(lock_timeout_exc)
     assert isinstance(attrs["stacktrace"], str)
     assert "OperationalError" in attrs["stacktrace"]
-    assert transaction_begins == 1
 
 
 def test_process_load_balancing_model_config_row_logs_update_after_sql_execution(
@@ -1440,23 +1457,6 @@ def test_process_load_balancing_model_config_row_logs_update_after_sql_execution
     sqlite_engine: sa.Engine,
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
-    create_minimal_legacy_model_type_schema(sqlite_engine)
-    created_at = datetime(2025, 1, 1, 12, 0, 0)
-    row_id = "40000000-0000-0000-0000-000000000002"
-    _insert_load_balancing_model_config(
-        sqlite_engine,
-        row_id=row_id,
-        tenant_id="tenant-1",
-        provider_name="openai",
-        model_name="gpt-4o-mini",
-        model_type="text-generation",
-        name="credential",
-        encrypted_config="{}",
-        credential_id="50000000-0000-0000-0000-000000000002",
-        enabled=True,
-        created_at=created_at,
-        updated_at=created_at,
-    )
     migration = migration_module.Migration(
         tenant_id="tenant-1",
         engine=sqlite_engine,
@@ -1465,33 +1465,42 @@ def test_process_load_balancing_model_config_row_logs_update_after_sql_execution
         model_types=(ModelType.LLM,),
         orm_models=(migration_module.LoadBalancingModelConfig,),
     )
-    candidate = migration._load_load_balancing_model_config_candidates(None)[0]
+    candidate = migration_module._RowWithRawModelType(
+        row=SimpleNamespace(id="lb-row-1"),
+        raw_model_type="text-generation",
+        canonical_model_type=ModelType.LLM,
+    )
     action_log: list[str] = []
 
-    def _record_begin(session: Session, transaction: SessionTransaction) -> None:
-        if session.get_bind() is sqlite_engine and transaction.parent is None:
+    class _FakeBeginContext:
+        def __enter__(self) -> None:
             action_log.append("begin")
 
-    def _record_sql(
-        connection: sa.Connection,
-        cursor: object,
-        statement: str,
-        parameters: object,
-        context: object,
-        executemany: bool,
-    ) -> None:
-        del connection, cursor, parameters, context, executemany
-        if statement.lstrip().upper().startswith("UPDATE"):
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+    class _FakeSession:
+        def __enter__(self):
+            return self
+
+        def __exit__(self, exc_type, exc, tb) -> bool:
+            return False
+
+        def begin(self) -> _FakeBeginContext:
+            return _FakeBeginContext()
+
+        def execute(self, stmt) -> None:
             action_log.append("sql_execute")
 
+    def _fake_session_factory(engine: sa.Engine) -> _FakeSession:
+        return _FakeSession()
+
     def _fake_configure(self, session) -> None:
         action_log.append("configure_lock_timeout")
 
-    original_reload = migration_module.Migration._reload_load_balancing_model_config_candidate
-
-    def _record_reload(self, session: Session, original_candidate, *, lock_rows: bool):
+    def _fake_reload(self, session, original_candidate, *, lock_rows: bool):
         action_log.append(f"reload_candidate:{lock_rows}")
-        return original_reload(self, session, original_candidate, lock_rows=lock_rows)
+        return candidate
 
     def _fake_log_row_updated(self, *args, **kwargs) -> None:
         action_log.append("log_row_updated")
@@ -1499,11 +1508,12 @@ def test_process_load_balancing_model_config_row_logs_update_after_sql_execution
     def _fake_cache_cleanup(self, *, row_id: str, tx_id: str) -> None:
         action_log.append("cache_cleanup")
 
+    monkeypatch.setattr(migration_module, "_session_factory", _fake_session_factory)
     monkeypatch.setattr(migration_module.Migration, "_configure_lock_timeout", _fake_configure)
     monkeypatch.setattr(
         migration_module.Migration,
         "_reload_load_balancing_model_config_candidate",
-        _record_reload,
+        _fake_reload,
     )
     monkeypatch.setattr(migration_module.Migration, "_log_row_updated", _fake_log_row_updated)
     monkeypatch.setattr(
@@ -1512,13 +1522,7 @@ def test_process_load_balancing_model_config_row_logs_update_after_sql_execution
         _fake_cache_cleanup,
     )
 
-    sa.event.listen(Session, "after_transaction_create", _record_begin)
-    sa.event.listen(sqlite_engine, "before_cursor_execute", _record_sql)
-    try:
-        migration._process_load_balancing_model_config_row(candidate)
-    finally:
-        sa.event.remove(sqlite_engine, "before_cursor_execute", _record_sql)
-        sa.event.remove(Session, "after_transaction_create", _record_begin)
+    migration._process_load_balancing_model_config_row(candidate)
 
     assert action_log == [
         "begin",
@@ -1528,10 +1532,6 @@ def test_process_load_balancing_model_config_row_logs_update_after_sql_execution
         "log_row_updated",
         "cache_cleanup",
     ]
-    with Session(sqlite_engine) as session:
-        persisted = session.get(migration_module.LoadBalancingModelConfig, row_id)
-        assert persisted is not None
-        assert persisted.model_type == ModelType.LLM
 
 
 def test_load_balancing_model_config_cache_delete_failure_logs_stacktrace(

api/tests/unit_tests/commands/test_migrate_legacy_sys_files_workflows.py

@@ -1,236 +0,0 @@
-from types import SimpleNamespace
-from unittest.mock import MagicMock
-
-import click
-import pytest
-
-from commands import migrate_legacy_sys_files_workflows
-from commands import workflow_migration as workflow_migration_commands
-
-
-def test_migrate_legacy_sys_files_workflows_command_passes_batch_options(mocker, capsys):
-    runner = mocker.patch.object(
-        workflow_migration_commands,
-        "run_legacy_sys_files_workflow_migration",
-        return_value=workflow_migration_commands.LegacySysFilesWorkflowMigrationStats(
-            scanned=10,
-            migrated=2,
-            failed=0,
-            batches=1,
-            last_id="workflow-10",
-        ),
-    )
-
-    migrate_legacy_sys_files_workflows.callback(
-        batch_size=200,
-        limit=500,
-        start_after_id="workflow-1",
-        tenant_id="tenant-1",
-        app_id="app-1",
-        dry_run=True,
-    )
-
-    runner.assert_called_once_with(
-        batch_size=200,
-        limit=500,
-        start_after_id="workflow-1",
-        tenant_id="tenant-1",
-        app_id="app-1",
-        dry_run=True,
-    )
-    captured = capsys.readouterr()
-    assert "scanned=10" in captured.out
-    assert "migrated=2" in captured.out
-    assert "last_id=workflow-10" in captured.out
-
-
-def test_migrate_legacy_sys_files_workflows_rejects_non_positive_batch_size():
-    with pytest.raises(click.UsageError, match="batch-size"):
-        migrate_legacy_sys_files_workflows.callback(
-            batch_size=0,
-            limit=None,
-            start_after_id=None,
-            tenant_id=None,
-            app_id=None,
-            dry_run=False,
-        )
-
-
-def test_migrate_legacy_sys_files_workflows_rejects_non_positive_limit():
-    with pytest.raises(click.UsageError, match="limit"):
-        migrate_legacy_sys_files_workflows.callback(
-            batch_size=100,
-            limit=0,
-            start_after_id=None,
-            tenant_id=None,
-            app_id=None,
-            dry_run=False,
-        )
-
-
-def test_build_legacy_sys_files_workflow_query_uses_keyset_pagination():
-    stmt = workflow_migration_commands._build_legacy_sys_files_workflow_query(
-        start_after_id="workflow-1",
-        batch_size=200,
-        tenant_id="tenant-1",
-        app_id="app-1",
-    )
-    compiled = str(stmt.compile(compile_kwargs={"literal_binds": True}))
-
-    assert "workflows.id > 'workflow-1'" in compiled
-    assert "workflows.tenant_id = 'tenant-1'" in compiled
-    assert "workflows.app_id = 'app-1'" in compiled
-    assert "ORDER BY workflows.id" in compiled
-    assert "LIMIT 200" in compiled
-    assert "workflows.environment_variables" not in compiled
-
-
-def test_migrate_legacy_sys_files_workflow_batch_dry_run_rolls_back():
-    migrated_workflow = MagicMock()
-    migrated_workflow.id = "workflow-1"
-    migrated_workflow.migrate_legacy_sys_files_graph_in_place.return_value = True
-    untouched_workflow = MagicMock()
-    untouched_workflow.id = "workflow-2"
-    untouched_workflow.migrate_legacy_sys_files_graph_in_place.return_value = False
-    session = MagicMock()
-    session.scalars.return_value.all.return_value = [migrated_workflow, untouched_workflow]
-
-    stats = workflow_migration_commands._migrate_legacy_sys_files_workflow_batch(
-        session=session,
-        start_after_id=None,
-        batch_size=200,
-        tenant_id=None,
-        app_id=None,
-        dry_run=True,
-    )
-
-    assert stats.scanned == 2
-    assert stats.migrated == 1
-    assert stats.failed == 0
-    assert stats.last_id == "workflow-2"
-    session.rollback.assert_called_once()
-    session.commit.assert_not_called()
-
-
-def test_migrate_legacy_sys_files_workflow_batch_commits_and_counts_failures(caplog):
-    migrated_workflow = MagicMock()
-    migrated_workflow.id = "workflow-1"
-    migrated_workflow.migrate_legacy_sys_files_graph_in_place.return_value = True
-    failing_workflow = MagicMock()
-    failing_workflow.id = "workflow-2"
-    failing_workflow.migrate_legacy_sys_files_graph_in_place.side_effect = RuntimeError("boom")
-    session = MagicMock()
-    session.scalars.return_value.all.return_value = [migrated_workflow, failing_workflow]
-
-    stats = workflow_migration_commands._migrate_legacy_sys_files_workflow_batch(
-        session=session,
-        start_after_id=None,
-        batch_size=200,
-        tenant_id=None,
-        app_id=None,
-        dry_run=False,
-    )
-
-    assert stats.scanned == 2
-    assert stats.migrated == 1
-    assert stats.failed == 1
-    assert stats.last_id == "workflow-2"
-    assert "Failed to migrate legacy" in caplog.text
-    session.commit.assert_called_once()
-    session.rollback.assert_not_called()
-
-
-def test_run_legacy_sys_files_workflow_migration_uses_keyset_batches(mocker):
-    session_maker = MagicMock()
-    sessions = [MagicMock(), MagicMock()]
-    session_maker.side_effect = sessions
-    mocker.patch.object(workflow_migration_commands, "sessionmaker", return_value=session_maker)
-    mocker.patch.object(workflow_migration_commands, "db", SimpleNamespace(engine=object()))
-    migrate_batch = mocker.patch.object(
-        workflow_migration_commands,
-        "_migrate_legacy_sys_files_workflow_batch",
-        side_effect=[
-            workflow_migration_commands.LegacySysFilesWorkflowMigrationStats(
-                scanned=2,
-                migrated=1,
-                failed=0,
-                last_id="workflow-2",
-            ),
-            workflow_migration_commands.LegacySysFilesWorkflowMigrationStats(
-                scanned=1,
-                migrated=1,
-                failed=0,
-                last_id="workflow-3",
-            ),
-        ],
-    )
-
-    stats = workflow_migration_commands.run_legacy_sys_files_workflow_migration(
-        batch_size=2,
-        limit=3,
-        start_after_id="workflow-0",
-        tenant_id="tenant-1",
-        app_id="app-1",
-        dry_run=True,
-    )
-
-    assert stats.scanned == 3
-    assert stats.migrated == 2
-    assert stats.batches == 2
-    assert stats.last_id == "workflow-3"
-    assert migrate_batch.call_args_list[0].kwargs["start_after_id"] == "workflow-0"
-    assert migrate_batch.call_args_list[0].kwargs["batch_size"] == 2
-    assert migrate_batch.call_args_list[1].kwargs["start_after_id"] == "workflow-2"
-    assert migrate_batch.call_args_list[1].kwargs["batch_size"] == 1
-
-
-def test_run_legacy_sys_files_workflow_migration_stops_on_empty_batch(mocker):
-    session_maker = MagicMock(return_value=MagicMock())
-    mocker.patch.object(workflow_migration_commands, "sessionmaker", return_value=session_maker)
-    mocker.patch.object(workflow_migration_commands, "db", SimpleNamespace(engine=object()))
-    mocker.patch.object(
-        workflow_migration_commands,
-        "_migrate_legacy_sys_files_workflow_batch",
-        return_value=workflow_migration_commands.LegacySysFilesWorkflowMigrationStats(scanned=0),
-    )
-
-    stats = workflow_migration_commands.run_legacy_sys_files_workflow_migration(
-        batch_size=2,
-        limit=None,
-        start_after_id=None,
-        tenant_id=None,
-        app_id=None,
-        dry_run=False,
-    )
-
-    assert stats.scanned == 0
-    assert stats.batches == 0
-
-
-def test_run_legacy_sys_files_workflow_migration_stops_on_short_batch(mocker):
-    session_maker = MagicMock(return_value=MagicMock())
-    mocker.patch.object(workflow_migration_commands, "sessionmaker", return_value=session_maker)
-    mocker.patch.object(workflow_migration_commands, "db", SimpleNamespace(engine=object()))
-    migrate_batch = mocker.patch.object(
-        workflow_migration_commands,
-        "_migrate_legacy_sys_files_workflow_batch",
-        return_value=workflow_migration_commands.LegacySysFilesWorkflowMigrationStats(
-            scanned=1,
-            migrated=1,
-            failed=0,
-            last_id="workflow-1",
-        ),
-    )
-
-    stats = workflow_migration_commands.run_legacy_sys_files_workflow_migration(
-        batch_size=2,
-        limit=None,
-        start_after_id=None,
-        tenant_id=None,
-        app_id=None,
-        dry_run=False,
-    )
-
-    assert stats.scanned == 1
-    assert stats.batches == 1
-    migrate_batch.assert_called_once()

api/tests/unit_tests/commands/test_reset_encrypt_key_pair.py

@@ -14,7 +14,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 import commands
-from commands import workspace as workspace_commands
+from commands import system as system_commands
 from core.tools.entities.tool_entities import ApiProviderSchemaType
 from graphon.model_runtime.entities.model_entities import ModelType
 from models import Tenant
@@ -83,11 +83,11 @@ def _encrypted_rows(tenant_id: str, *, suffix: str = "1") -> tuple[object, ...]:
 
 
 def _bind_command_to_sqlite(monkeypatch: pytest.MonkeyPatch, session: Session) -> None:
-    monkeypatch.setattr(workspace_commands, "db", SimpleNamespace(engine=session.get_bind()))
+    monkeypatch.setattr(system_commands, "db", SimpleNamespace(engine=session.get_bind()))
 
 
 def test_reset_aborts_when_not_self_hosted(monkeypatch, capsys):
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "CLOUD")
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "CLOUD")
 
     exit_code = _invoke_reset()
     captured = capsys.readouterr()
@@ -106,8 +106,8 @@ def test_reset_purges_provider_and_tool_tables_for_each_tenant(
 ) -> None:
     """The command must purge LLM provider rows AND every tool provider table
     that stores ciphertext encrypted under the tenant key (#35396)."""
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "SELF_HOSTED")
-    monkeypatch.setattr(workspace_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "SELF_HOSTED")
+    monkeypatch.setattr(system_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
     _bind_command_to_sqlite(monkeypatch, sqlite_session)
 
     tenant = _tenant(TENANT_ID)
@@ -146,8 +146,8 @@ def test_reset_purges_provider_and_tool_tables_for_each_tenant(
 )
 def test_reset_iterates_all_tenants(monkeypatch: pytest.MonkeyPatch, sqlite_session: Session) -> None:
     """Multi-tenant deployments must purge every tenant, not just the first."""
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "SELF_HOSTED")
-    monkeypatch.setattr(workspace_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "SELF_HOSTED")
+    monkeypatch.setattr(system_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
 
     _bind_command_to_sqlite(monkeypatch, sqlite_session)
     tenant_ids = [f"11111111-1111-1111-1111-{index:012d}" for index in range(3)]

api/tests/unit_tests/commands/test_upgrade_db.py

@@ -4,7 +4,7 @@ import types
 from unittest.mock import MagicMock
 
 import commands
-from commands import database as database_commands
+from commands import system as system_commands
 from libs.db_migration_lock import LockNotOwnedError, RedisError
 
 HEARTBEAT_WAIT_TIMEOUT_SECONDS = 5.0
@@ -25,11 +25,11 @@ def _invoke_upgrade_db() -> int:
 
 
 def test_upgrade_db_skips_when_lock_not_acquired(monkeypatch, capsys):
-    monkeypatch.setattr(database_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 1234)
+    monkeypatch.setattr(system_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 1234)
 
     lock = MagicMock()
     lock.acquire.return_value = False
-    database_commands.redis_client.lock.return_value = lock
+    system_commands.redis_client.lock.return_value = lock
 
     exit_code = _invoke_upgrade_db()
     captured = capsys.readouterr()
@@ -37,20 +37,18 @@ def test_upgrade_db_skips_when_lock_not_acquired(monkeypatch, capsys):
     assert exit_code == 0
     assert "Database migration skipped" in captured.out
 
-    database_commands.redis_client.lock.assert_called_once_with(
-        name="db_upgrade_lock", timeout=1234, thread_local=False
-    )
+    system_commands.redis_client.lock.assert_called_once_with(name="db_upgrade_lock", timeout=1234, thread_local=False)
     lock.acquire.assert_called_once_with(blocking=False)
     lock.release.assert_not_called()
 
 
 def test_upgrade_db_failure_not_masked_by_lock_release(monkeypatch, capsys):
-    monkeypatch.setattr(database_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 321)
+    monkeypatch.setattr(system_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 321)
 
     lock = MagicMock()
     lock.acquire.return_value = True
     lock.release.side_effect = LockNotOwnedError("simulated")
-    database_commands.redis_client.lock.return_value = lock
+    system_commands.redis_client.lock.return_value = lock
 
     def _upgrade():
         raise RuntimeError("boom")
@@ -63,18 +61,18 @@ def test_upgrade_db_failure_not_masked_by_lock_release(monkeypatch, capsys):
     assert exit_code == 1
     assert "Database migration failed: boom" in captured.out
 
-    database_commands.redis_client.lock.assert_called_once_with(name="db_upgrade_lock", timeout=321, thread_local=False)
+    system_commands.redis_client.lock.assert_called_once_with(name="db_upgrade_lock", timeout=321, thread_local=False)
     lock.acquire.assert_called_once_with(blocking=False)
     lock.release.assert_called_once()
 
 
 def test_upgrade_db_success_ignores_lock_not_owned_on_release(monkeypatch, capsys):
-    monkeypatch.setattr(database_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 999)
+    monkeypatch.setattr(system_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 999)
 
     lock = MagicMock()
     lock.acquire.return_value = True
     lock.release.side_effect = LockNotOwnedError("simulated")
-    database_commands.redis_client.lock.return_value = lock
+    system_commands.redis_client.lock.return_value = lock
 
     _install_fake_flask_migrate(monkeypatch, lambda: None)
 
@@ -84,7 +82,7 @@ def test_upgrade_db_success_ignores_lock_not_owned_on_release(monkeypatch, capsy
     assert exit_code == 0
     assert "Database migration successful!" in captured.out
 
-    database_commands.redis_client.lock.assert_called_once_with(name="db_upgrade_lock", timeout=999, thread_local=False)
+    system_commands.redis_client.lock.assert_called_once_with(name="db_upgrade_lock", timeout=999, thread_local=False)
     lock.acquire.assert_called_once_with(blocking=False)
     lock.release.assert_called_once()
 
@@ -95,11 +93,11 @@ def test_upgrade_db_renews_lock_during_migration(monkeypatch, capsys):
     """
 
     # Use a small TTL so the heartbeat interval triggers quickly.
-    monkeypatch.setattr(database_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 0.3)
+    monkeypatch.setattr(system_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 0.3)
 
     lock = MagicMock()
     lock.acquire.return_value = True
-    database_commands.redis_client.lock.return_value = lock
+    system_commands.redis_client.lock.return_value = lock
 
     renewed = threading.Event()
 
@@ -123,11 +121,11 @@ def test_upgrade_db_renews_lock_during_migration(monkeypatch, capsys):
 
 def test_upgrade_db_ignores_reacquire_errors(monkeypatch, capsys):
     # Use a small TTL so heartbeat runs during the upgrade call.
-    monkeypatch.setattr(database_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 0.3)
+    monkeypatch.setattr(system_commands, "DB_UPGRADE_LOCK_TTL_SECONDS", 0.3)
 
     lock = MagicMock()
     lock.acquire.return_value = True
-    database_commands.redis_client.lock.return_value = lock
+    system_commands.redis_client.lock.return_value = lock
 
     attempted = threading.Event()
 

api/tests/unit_tests/commands/test_workspace.py

@@ -1,49 +0,0 @@
-from unittest.mock import MagicMock
-
-from commands import reset_encrypt_key_pair
-from commands import workspace as workspace_commands
-
-
-def test_reset_encrypt_key_pair_skips_non_self_hosted(monkeypatch, capsys):
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "CLOUD")
-
-    reset_encrypt_key_pair.callback()
-
-    captured = capsys.readouterr()
-    assert "only for SELF_HOSTED" in captured.out
-
-
-def test_reset_encrypt_key_pair_rotates_keys_and_removes_custom_provider_data(monkeypatch, capsys):
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "SELF_HOSTED")
-    monkeypatch.setattr(workspace_commands, "generate_key_pair", lambda tenant_id: f"public-key-{tenant_id}")
-    tenant = MagicMock()
-    tenant.id = "tenant-1"
-    session = MagicMock()
-    session.scalars.return_value.all.return_value = [tenant]
-    session_manager = MagicMock()
-    session_manager.begin.return_value.__enter__.return_value = session
-    monkeypatch.setattr(workspace_commands, "sessionmaker", lambda *args, **kwargs: session_manager)
-    monkeypatch.setattr(workspace_commands, "db", MagicMock(engine=object()))
-
-    reset_encrypt_key_pair.callback()
-
-    assert tenant.encrypt_public_key == "public-key-tenant-1"
-    assert session.execute.call_count == 5
-    captured = capsys.readouterr()
-    assert "tenant-1 has been reset" in captured.out
-
-
-def test_reset_encrypt_key_pair_stops_when_workspace_record_is_missing(monkeypatch, capsys):
-    monkeypatch.setattr(workspace_commands.dify_config, "EDITION", "SELF_HOSTED")
-    session = MagicMock()
-    session.scalars.return_value.all.return_value = [None]
-    session_manager = MagicMock()
-    session_manager.begin.return_value.__enter__.return_value = session
-    monkeypatch.setattr(workspace_commands, "sessionmaker", lambda *args, **kwargs: session_manager)
-    monkeypatch.setattr(workspace_commands, "db", MagicMock(engine=object()))
-
-    reset_encrypt_key_pair.callback()
-
-    session.execute.assert_not_called()
-    captured = capsys.readouterr()
-    assert "No workspaces found" in captured.out

api/tests/unit_tests/controllers/console/datasets/test_data_source.py

@@ -1,22 +1,18 @@
 from __future__ import annotations
 
 import inspect
-from collections.abc import Callable, Iterator
+from collections.abc import Callable
 from datetime import UTC, datetime
-from typing import Literal, cast
+from typing import cast
 from unittest.mock import MagicMock, PropertyMock, patch
-from uuid import UUID
+from uuid import uuid4
 
 import pytest
 from flask import Flask
-from sqlalchemy import select
-from sqlalchemy.orm import Session
-from werkzeug.exceptions import NotFound
 
 from controllers.console.datasets import data_source as module
 from controllers.console.datasets.data_source import DataSourceApi, DataSourceNotionListApi
 from models import Account, DataSourceOauthBinding
-from models.engine import db
 
 ControllerMethod = Callable[..., tuple[dict[str, object], int]]
 
@@ -26,15 +22,10 @@ def unwrap(func: object) -> ControllerMethod:
 
 
 @pytest.fixture
-def flask_app() -> Iterator[Flask]:
+def flask_app() -> Flask:
     app = Flask(__name__)
     app.config["TESTING"] = True
-    app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///:memory:"
-    db.init_app(app)
-
-    with app.app_context():
-        DataSourceOauthBinding.__table__.create(db.engine)
-        yield app
+    return app
 
 
 @pytest.fixture
@@ -44,13 +35,9 @@ def current_user() -> Account:
     return account
 
 
-TENANT_ID = "11111111-1111-1111-1111-111111111111"
-BINDING_ID = "22222222-2222-2222-2222-222222222222"
-
-
-def _add_binding(session: Session, *, disabled: bool) -> DataSourceOauthBinding:
+def test_get_data_source_integrates_serializes_orm_binding(flask_app: Flask) -> None:
     binding = DataSourceOauthBinding(
-        tenant_id=TENANT_ID,
+        tenant_id="tenant-1",
         access_token="token",
         provider="notion",
         source_info={
@@ -68,31 +55,24 @@ def _add_binding(session: Session, *, disabled: bool) -> DataSourceOauthBinding:
                 }
             ],
         },
-        disabled=disabled,
     )
-    binding.id = BINDING_ID
+    binding.id = "binding-1"
     binding.created_at = datetime(2026, 5, 25, 1, 2, 3, tzinfo=UTC)
-    session.add(binding)
-    session.commit()
-    return binding
+    binding.disabled = False
 
-
-def test_get_data_source_integrates_serializes_orm_binding(
-    flask_app: Flask,
-) -> None:
-    binding = _add_binding(db.session, disabled=False)
-    expected_created_at = int(binding.created_at.timestamp())
-
-    with flask_app.test_request_context("/"):
-        response, status = unwrap(DataSourceApi().get)(DataSourceApi(), TENANT_ID)
+    with (
+        flask_app.test_request_context("/"),
+        patch.object(module.db.session, "scalars", return_value=MagicMock(all=lambda: [binding])),
+    ):
+        response, status = unwrap(DataSourceApi().get)(DataSourceApi(), "tenant-1")
 
     assert status == 200
     assert response == {
         "data": [
             {
-                "id": BINDING_ID,
+                "id": "binding-1",
                 "provider": "notion",
-                "created_at": expected_created_at,
+                "created_at": 1779670923,
                 "is_bound": True,
                 "disabled": False,
                 "source_info": {
@@ -116,75 +96,34 @@ def test_get_data_source_integrates_serializes_orm_binding(
     }
 
 
-def test_get_data_source_integrates_preserves_empty_list_when_no_binding(
-    flask_app: Flask,
-) -> None:
-    with flask_app.test_request_context("/"):
-        response, status = unwrap(DataSourceApi().get)(DataSourceApi(), TENANT_ID)
+def test_get_data_source_integrates_preserves_empty_list_when_no_binding(flask_app: Flask) -> None:
+    with (
+        flask_app.test_request_context("/"),
+        patch.object(module.db.session, "scalars", return_value=MagicMock(all=lambda: [])),
+    ):
+        response, status = unwrap(DataSourceApi().get)(DataSourceApi(), "tenant-1")
 
     assert status == 200
     assert response == {"data": []}
 
 
-@pytest.mark.parametrize(
-    ("disabled", "action", "expected_disabled"),
-    [(True, "enable", False), (False, "disable", True)],
-)
-@pytest.mark.parametrize("sqlite_session", [(DataSourceOauthBinding,)], indirect=True)
-def test_patch_data_source_binding_updates_state(
-    flask_app: Flask,
-    sqlite_session: Session,
-    disabled: bool,
-    action: Literal["enable", "disable"],
-    expected_disabled: bool,
-) -> None:
-    _add_binding(sqlite_session, disabled=disabled)
-    sqlite_session.expunge_all()
+def test_patch_data_source_binding_uses_injected_session(flask_app: Flask) -> None:
+    binding = MagicMock(disabled=True)
+    session = MagicMock()
+    session.scalar.return_value = binding
 
     with flask_app.test_request_context("/"):
-        response, status = unwrap(DataSourceApi().patch)(
-            DataSourceApi(), sqlite_session, TENANT_ID, UUID(BINDING_ID), action
-        )
+        response, status = unwrap(DataSourceApi().patch)(DataSourceApi(), session, "tenant-1", uuid4(), "enable")
 
-    sqlite_session.flush()
-    sqlite_session.expire_all()
-    binding = sqlite_session.scalar(select(DataSourceOauthBinding).where(DataSourceOauthBinding.id == BINDING_ID))
     assert status == 200
     assert response == {"result": "success"}
-    assert binding is not None
-    assert binding.disabled is expected_disabled
+    assert binding.disabled is False
+    session.scalar.assert_called_once()
+    session.add.assert_not_called()
+    session.commit.assert_not_called()
 
 
-@pytest.mark.parametrize("sqlite_session", [(DataSourceOauthBinding,)], indirect=True)
-def test_patch_data_source_binding_rejects_unknown_binding(
-    flask_app: Flask,
-    sqlite_session: Session,
-) -> None:
-    with flask_app.test_request_context("/"), pytest.raises(NotFound, match="Data source binding not found"):
-        unwrap(DataSourceApi().patch)(DataSourceApi(), sqlite_session, TENANT_ID, UUID(BINDING_ID), "enable")
-
-
-@pytest.mark.parametrize(("disabled", "action"), [(False, "enable"), (True, "disable")])
-@pytest.mark.parametrize("sqlite_session", [(DataSourceOauthBinding,)], indirect=True)
-def test_patch_data_source_binding_rejects_current_state(
-    flask_app: Flask,
-    sqlite_session: Session,
-    disabled: bool,
-    action: Literal["enable", "disable"],
-) -> None:
-    _add_binding(sqlite_session, disabled=disabled)
-    sqlite_session.expunge_all()
-
-    with flask_app.test_request_context("/"), pytest.raises(ValueError):
-        unwrap(DataSourceApi().patch)(DataSourceApi(), sqlite_session, TENANT_ID, UUID(BINDING_ID), action)
-
-
-@pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-def test_notion_pre_import_pages_serializes_frontend_list_shape(
-    flask_app: Flask,
-    current_user: Account,
-    sqlite_session: Session,
-) -> None:
+def test_notion_pre_import_pages_serializes_frontend_list_shape(flask_app: Flask, current_user: Account) -> None:
     page = MagicMock(
         page_id="page-1",
         page_name="Page",
@@ -206,6 +145,8 @@ def test_notion_pre_import_pages_serializes_frontend_list_shape(
         get_online_document_pages=MagicMock(return_value=iter([online_document_message])),
         datasource_provider_type=MagicMock(return_value="online_document"),
     )
+    session = MagicMock()
+
     with (
         flask_app.test_request_context("/?credential_id=credential-1"),
         patch.object(
@@ -217,7 +158,7 @@ def test_notion_pre_import_pages_serializes_frontend_list_shape(
         patch("core.datasource.datasource_manager.DatasourceManager.get_datasource_runtime", return_value=runtime),
     ):
         response, status = unwrap(DataSourceNotionListApi().get)(
-            DataSourceNotionListApi(), sqlite_session, "tenant-1", current_user
+            DataSourceNotionListApi(), session, "tenant-1", current_user
         )
 
     assert status == 200
@@ -242,38 +183,3 @@ def test_notion_pre_import_pages_serializes_frontend_list_shape(
     }
     runtime.get_online_document_pages.assert_called_once()
     assert runtime.get_online_document_pages.call_args.kwargs["datasource_parameters"] == {}
-
-
-@pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-def test_notion_pre_import_pages_rejects_missing_credential(
-    flask_app: Flask,
-    current_user: Account,
-    sqlite_session: Session,
-) -> None:
-    with (
-        flask_app.test_request_context("/?credential_id=credential-1"),
-        patch.object(module.DatasourceProviderService, "get_datasource_credentials", return_value=None),
-        pytest.raises(NotFound, match="Credential not found"),
-    ):
-        unwrap(DataSourceNotionListApi().get)(DataSourceNotionListApi(), sqlite_session, TENANT_ID, current_user)
-
-
-@pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-def test_notion_pre_import_pages_rejects_non_notion_dataset(
-    flask_app: Flask,
-    current_user: Account,
-    sqlite_session: Session,
-) -> None:
-    dataset = MagicMock(data_source_type="other_type")
-
-    with (
-        flask_app.test_request_context("/?credential_id=credential-1&dataset_id=dataset-1"),
-        patch.object(
-            module.DatasourceProviderService,
-            "get_datasource_credentials",
-            return_value={"token": "token"},
-        ),
-        patch.object(module.DatasetService, "get_dataset", return_value=dataset),
-        pytest.raises(ValueError, match="Dataset is not notion type"),
-    ):
-        unwrap(DataSourceNotionListApi().get)(DataSourceNotionListApi(), sqlite_session, TENANT_ID, current_user)

api/tests/unit_tests/controllers/console/datasets/test_data_source_notion_apis.py

@@ -1,171 +0,0 @@
-"""Unit tests for controllers.console.datasets.data_source Notion endpoints."""
-
-from __future__ import annotations
-
-import inspect
-from unittest.mock import MagicMock, patch
-
-import pytest
-from flask import Flask
-from sqlalchemy.orm import Session
-from werkzeug.exceptions import NotFound
-
-from controllers.console.datasets.data_source import (
-    DataSourceNotionDatasetSyncApi,
-    DataSourceNotionDocumentSyncApi,
-    DataSourceNotionIndexingEstimateApi,
-    DataSourceNotionPreviewApi,
-)
-from core.rag.index_processor.constant.index_type import IndexStructureType
-from models import Account
-
-
-@pytest.fixture
-def current_user() -> Account:
-    account = Account(name="Test User", email="u1@example.com")
-    account.id = "u1"
-    return account
-
-
-class TestDataSourceNotionPreviewApi:
-    def test_get_preview_success(self, app: Flask) -> None:
-        api = DataSourceNotionPreviewApi()
-        method = inspect.unwrap(api.get)
-
-        extractor = MagicMock(extract=lambda: [MagicMock(page_content="hello")])
-
-        with (
-            app.test_request_context("/?credential_id=c1"),
-            patch(
-                "controllers.console.datasets.data_source.DatasourceProviderService.get_datasource_credentials",
-                return_value={"integration_secret": "t"},
-            ),
-            patch(
-                "controllers.console.datasets.data_source.NotionExtractor",
-                return_value=extractor,
-            ),
-        ):
-            response, status = method(api, "tenant-1", "p1", "page")
-
-        assert status == 200
-
-
-class TestDataSourceNotionIndexingEstimateApi:
-    @pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-    def test_post_indexing_estimate_success(self, app: Flask, sqlite_session: Session) -> None:
-        api = DataSourceNotionIndexingEstimateApi()
-        method = inspect.unwrap(api.post)
-
-        empty_rules: dict[str, object] = {}
-        payload: dict[str, object] = {
-            "notion_info_list": [
-                {
-                    "workspace_id": "w1",
-                    "credential_id": "c1",
-                    "pages": [{"page_id": "p1", "type": "page"}],
-                }
-            ],
-            "process_rule": {"rules": empty_rules},
-            "doc_form": IndexStructureType.PARAGRAPH_INDEX,
-            "doc_language": "English",
-        }
-
-        with (
-            app.test_request_context("/", method="POST", json=payload, headers={"Content-Type": "application/json"}),
-            patch(
-                "controllers.console.datasets.data_source.DocumentService.estimate_args_validate",
-            ),
-            patch(
-                "controllers.console.datasets.data_source.IndexingRunner.indexing_estimate",
-                return_value=MagicMock(model_dump=lambda: {"total_pages": 1}),
-            ),
-        ):
-            response, status = method(api, sqlite_session, "tenant-1")
-
-        assert status == 200
-
-
-class TestDataSourceNotionDatasetSyncApi:
-    @pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-    def test_get_success(self, app: Flask, sqlite_session: Session) -> None:
-        api = DataSourceNotionDatasetSyncApi()
-        method = inspect.unwrap(api.get)
-
-        with (
-            app.test_request_context("/"),
-            patch(
-                "controllers.console.datasets.data_source.DatasetService.get_dataset",
-                return_value=MagicMock(),
-            ),
-            patch(
-                "controllers.console.datasets.data_source.DocumentService.get_document_by_dataset_id",
-                return_value=[MagicMock(id="d1")],
-            ),
-            patch(
-                "controllers.console.datasets.data_source.document_indexing_sync_task.delay",
-                return_value=None,
-            ),
-        ):
-            response, status = method(api, sqlite_session, "ds-1")
-
-        assert status == 200
-
-    @pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-    def test_get_dataset_not_found(self, app: Flask, sqlite_session: Session) -> None:
-        api = DataSourceNotionDatasetSyncApi()
-        method = inspect.unwrap(api.get)
-
-        with (
-            app.test_request_context("/"),
-            patch(
-                "controllers.console.datasets.data_source.DatasetService.get_dataset",
-                return_value=None,
-            ),
-        ):
-            with pytest.raises(NotFound):
-                method(api, sqlite_session, "ds-1")
-
-
-class TestDataSourceNotionDocumentSyncApi:
-    @pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-    def test_get_success(self, app: Flask, sqlite_session: Session) -> None:
-        api = DataSourceNotionDocumentSyncApi()
-        method = inspect.unwrap(api.get)
-
-        with (
-            app.test_request_context("/"),
-            patch(
-                "controllers.console.datasets.data_source.DatasetService.get_dataset",
-                return_value=MagicMock(),
-            ),
-            patch(
-                "controllers.console.datasets.data_source.DocumentService.get_document",
-                return_value=MagicMock(),
-            ),
-            patch(
-                "controllers.console.datasets.data_source.document_indexing_sync_task.delay",
-                return_value=None,
-            ),
-        ):
-            response, status = method(api, sqlite_session, "ds-1", "doc-1")
-
-        assert status == 200
-
-    @pytest.mark.parametrize("sqlite_session", [()], indirect=True)
-    def test_get_document_not_found(self, app: Flask, sqlite_session: Session) -> None:
-        api = DataSourceNotionDocumentSyncApi()
-        method = inspect.unwrap(api.get)
-
-        with (
-            app.test_request_context("/"),
-            patch(
-                "controllers.console.datasets.data_source.DatasetService.get_dataset",
-                return_value=MagicMock(),
-            ),
-            patch(
-                "controllers.console.datasets.data_source.DocumentService.get_document",
-                return_value=None,
-            ),
-        ):
-            with pytest.raises(NotFound):
-                method(api, sqlite_session, "ds-1", "doc-1")

api/tests/unit_tests/controllers/service_api/app/test_legacy_system_files.py

@@ -1,89 +0,0 @@
-from unittest.mock import MagicMock
-
-from controllers.service_api.app.legacy_system_files import (
-    attach_legacy_system_file_warning_for_service_api,
-    normalize_legacy_system_file_args_for_service_api,
-)
-from core.app.entities.app_invoke_entities import InvokeFrom
-from services.app_generate_service import AppGenerateService
-
-_LEGACY_FILE_TEMPLATE = "{{#" + ".".join(("sys", "files")) + "#}}"
-_USER_INPUT_FILE_INPUT_KEY = ".".join(("userinput", "files"))
-
-
-def _legacy_file_graph() -> dict:
-    return {
-        "nodes": [
-            {"id": "start", "data": {"type": "start", "variables": []}},
-            {"id": "answer", "data": {"type": "answer", "answer": _LEGACY_FILE_TEMPLATE}},
-        ],
-        "edges": [],
-    }
-
-
-def test_hidden_service_api_file_payload_maps_to_userinput_files(mocker):
-    workflow = MagicMock()
-    workflow.graph_dict = _legacy_file_graph()
-    get_workflow = mocker.patch.object(AppGenerateService, "get_workflow", return_value=workflow)
-    app_model = MagicMock()
-    session = MagicMock()
-    files = [{"transfer_method": "remote_url", "url": "https://example.com/a.png"}]
-
-    args, compat_variable = normalize_legacy_system_file_args_for_service_api(
-        session=session,
-        app_model=app_model,
-        args={"inputs": {}, "files": None},
-        raw_payload={"system": {"files": files}},
-    )
-
-    get_workflow.assert_called_once_with(app_model, InvokeFrom.SERVICE_API, None, session=session)
-    assert compat_variable is not None
-    assert args["files"] == files
-    assert args["inputs"][_USER_INPUT_FILE_INPUT_KEY] == files
-
-
-def test_service_api_file_payload_is_ignored_when_absent(mocker):
-    get_workflow = mocker.patch.object(AppGenerateService, "get_workflow")
-    app_model = MagicMock()
-    original_args = {"inputs": {}}
-
-    args, compat_variable = normalize_legacy_system_file_args_for_service_api(
-        session=MagicMock(),
-        app_model=app_model,
-        args=original_args,
-        raw_payload={},
-    )
-
-    assert args is original_args
-    assert compat_variable is None
-    get_workflow.assert_not_called()
-
-
-def test_top_level_service_api_file_payload_still_checks_workflow_graph(mocker):
-    workflow = MagicMock()
-    workflow.graph_dict = {"nodes": []}
-    get_workflow = mocker.patch.object(AppGenerateService, "get_workflow", return_value=workflow)
-    app_model = MagicMock()
-    session = MagicMock()
-    files = [{"id": "file-1"}]
-
-    args, compat_variable = normalize_legacy_system_file_args_for_service_api(
-        session=session,
-        app_model=app_model,
-        args={"inputs": {}, "files": files},
-        raw_payload={},
-    )
-
-    get_workflow.assert_called_once_with(app_model, InvokeFrom.SERVICE_API, None, session=session)
-    assert args["files"] == files
-    assert compat_variable is None
-
-
-def test_service_api_warning_is_attached_only_when_compatibility_was_used():
-    compat_variable = MagicMock(node_id="userinput", variable_name="files")
-
-    response = attach_legacy_system_file_warning_for_service_api({"answer": "ok"}, compat_variable)
-    response_without_warning = attach_legacy_system_file_warning_for_service_api({"answer": "ok"}, None)
-
-    assert response["warnings"]
-    assert response_without_warning == {"answer": "ok"}

api/tests/unit_tests/controllers/service_api/app/test_message.py

@@ -15,15 +15,12 @@ Focus on:
 """
 
 import uuid
-from collections.abc import Iterator
 from inspect import unwrap
 from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
 from flask import Flask
-from sqlalchemy import Engine
-from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest, InternalServerError, NotFound
 
 from controllers.service_api.app.error import NotChatAppError
@@ -47,14 +44,6 @@ from services.errors.message import (
 from services.message_service import MessageService
 
 
-@pytest.fixture
-def orm_session(sqlite_engine: Engine) -> Iterator[Session]:
-    """Provide a real caller-owned session for MessageService interface tests."""
-
-    with Session(sqlite_engine, expire_on_commit=False) as session:
-        yield session
-
-
 class TestMessageListQuery:
     """Test suite for MessageListQuery Pydantic model."""
 
@@ -264,7 +253,7 @@ class TestMessageService:
         assert callable(MessageService.get_suggested_questions_after_answer)
 
     @patch.object(MessageService, "pagination_by_first_id")
-    def test_pagination_by_first_id_returns_pagination_result(self, mock_pagination, orm_session: Session):
+    def test_pagination_by_first_id_returns_pagination_result(self, mock_pagination):
         """Test pagination_by_first_id returns expected format."""
         mock_result = Mock()
         mock_result.data = []
@@ -278,7 +267,7 @@ class TestMessageService:
             conversation_id=str(uuid.uuid4()),
             first_id=None,
             limit=20,
-            session=orm_session,
+            session=Mock(),
         )
 
         assert hasattr(result, "data")
@@ -286,7 +275,7 @@ class TestMessageService:
         assert hasattr(result, "has_more")
 
     @patch.object(MessageService, "pagination_by_first_id")
-    def test_pagination_raises_conversation_not_exists_error(self, mock_pagination, orm_session: Session):
+    def test_pagination_raises_conversation_not_exists_error(self, mock_pagination):
         """Test pagination raises ConversationNotExistsError."""
         import services.errors.conversation
 
@@ -299,11 +288,11 @@ class TestMessageService:
                 conversation_id="invalid_id",
                 first_id=None,
                 limit=20,
-                session=orm_session,
+                session=Mock(),
             )
 
     @patch.object(MessageService, "pagination_by_first_id")
-    def test_pagination_raises_first_message_not_exists_error(self, mock_pagination, orm_session: Session):
+    def test_pagination_raises_first_message_not_exists_error(self, mock_pagination):
         """Test pagination raises FirstMessageNotExistsError."""
         mock_pagination.side_effect = FirstMessageNotExistsError()
 
@@ -314,11 +303,11 @@ class TestMessageService:
                 conversation_id=str(uuid.uuid4()),
                 first_id="invalid_first_id",
                 limit=20,
-                session=orm_session,
+                session=Mock(),
             )
 
     @patch.object(MessageService, "create_feedback")
-    def test_create_feedback_with_rating_and_content(self, mock_create_feedback, orm_session: Session):
+    def test_create_feedback_with_rating_and_content(self, mock_create_feedback):
         """Test create_feedback with rating and content."""
         mock_create_feedback.return_value = None
 
@@ -328,13 +317,13 @@ class TestMessageService:
             user=Mock(spec=EndUser),
             rating=FeedbackRating.LIKE,
             content="Great response!",
-            session=orm_session,
+            session=Mock(),
         )
 
         mock_create_feedback.assert_called_once()
 
     @patch.object(MessageService, "create_feedback")
-    def test_create_feedback_raises_message_not_exists_error(self, mock_create_feedback, orm_session: Session):
+    def test_create_feedback_raises_message_not_exists_error(self, mock_create_feedback):
         """Test create_feedback raises MessageNotExistsError."""
         mock_create_feedback.side_effect = MessageNotExistsError()
 
@@ -345,11 +334,11 @@ class TestMessageService:
                 user=Mock(spec=EndUser),
                 rating=FeedbackRating.LIKE,
                 content=None,
-                session=orm_session,
+                session=Mock(),
             )
 
     @patch.object(MessageService, "get_all_messages_feedbacks")
-    def test_get_all_messages_feedbacks_returns_list(self, mock_get_feedbacks, orm_session: Session):
+    def test_get_all_messages_feedbacks_returns_list(self, mock_get_feedbacks):
         """Test get_all_messages_feedbacks returns list of feedbacks."""
         mock_feedbacks = [
             {"message_id": str(uuid.uuid4()), "rating": "like"},
@@ -357,15 +346,13 @@ class TestMessageService:
         ]
         mock_get_feedbacks.return_value = mock_feedbacks
 
-        result = MessageService.get_all_messages_feedbacks(
-            app_model=Mock(spec=App), page=1, limit=20, session=orm_session
-        )
+        result = MessageService.get_all_messages_feedbacks(app_model=Mock(spec=App), page=1, limit=20, session=Mock())
 
         assert len(result) == 2
         assert result[0]["rating"] == "like"
 
     @patch.object(MessageService, "get_suggested_questions_after_answer")
-    def test_get_suggested_questions_returns_questions_list(self, mock_get_questions, orm_session: Session):
+    def test_get_suggested_questions_returns_questions_list(self, mock_get_questions):
         """Test get_suggested_questions_after_answer returns list of questions."""
         mock_questions = ["What about this aspect?", "Can you elaborate on that?", "How does this relate to...?"]
         mock_get_questions.return_value = mock_questions
@@ -375,14 +362,14 @@ class TestMessageService:
             user=Mock(spec=EndUser),
             message_id=str(uuid.uuid4()),
             invoke_from=Mock(),
-            session=orm_session,
+            session=Mock(),
         )
 
         assert len(result) == 3
         assert isinstance(result[0], str)
 
     @patch.object(MessageService, "get_suggested_questions_after_answer")
-    def test_get_suggested_questions_raises_disabled_error(self, mock_get_questions, orm_session: Session):
+    def test_get_suggested_questions_raises_disabled_error(self, mock_get_questions):
         """Test get_suggested_questions_after_answer raises SuggestedQuestionsAfterAnswerDisabledError."""
         mock_get_questions.side_effect = SuggestedQuestionsAfterAnswerDisabledError()
 
@@ -392,11 +379,11 @@ class TestMessageService:
                 user=Mock(spec=EndUser),
                 message_id=str(uuid.uuid4()),
                 invoke_from=Mock(),
-                session=orm_session,
+                session=Mock(),
             )
 
     @patch.object(MessageService, "get_suggested_questions_after_answer")
-    def test_get_suggested_questions_raises_message_not_exists_error(self, mock_get_questions, orm_session: Session):
+    def test_get_suggested_questions_raises_message_not_exists_error(self, mock_get_questions):
         """Test get_suggested_questions_after_answer raises MessageNotExistsError."""
         mock_get_questions.side_effect = MessageNotExistsError()
 
@@ -406,7 +393,7 @@ class TestMessageService:
                 user=Mock(spec=EndUser),
                 message_id="invalid_message_id",
                 invoke_from=Mock(),
-                session=orm_session,
+                session=Mock(),
             )
 
 

api/tests/unit_tests/controllers/service_api/dataset/rag_pipeline/test_rag_pipeline_workflow.py

@@ -24,7 +24,6 @@ from unittest.mock import Mock, patch
 
 import pytest
 from flask import Flask
-from sqlalchemy.orm import Session
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -39,7 +38,6 @@ from controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow import (
 )
 from core.app.entities.app_invoke_entities import InvokeFrom
 from models.account import Account
-from models.dataset import Dataset
 from services.errors.file import FileTooLargeError, UnsupportedFileTypeError
 from services.rag_pipeline.entity.pipeline_service_api_entities import (
     DatasourceNodeRunApiEntity,
@@ -48,20 +46,6 @@ from services.rag_pipeline.entity.pipeline_service_api_entities import (
 from services.rag_pipeline.rag_pipeline import RagPipelineService
 
 
-def _persist_dataset(session: Session, *, tenant_id: str, dataset_id: str) -> Dataset:
-    dataset = Dataset(
-        id=dataset_id,
-        tenant_id=tenant_id,
-        name="Pipeline dataset",
-        created_by="account-1",
-        data_source_type=None,
-        indexing_technique=None,
-    )
-    session.add(dataset)
-    session.commit()
-    return dataset
-
-
 class TestDatasourceNodeRunPayload:
     """Test suite for DatasourceNodeRunPayload Pydantic model."""
 
@@ -566,15 +550,13 @@ class TestPipelineRunApiPost:
     )
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.RagPipelineService")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.service_api_ns")
-    @pytest.mark.parametrize("sqlite_session", [(Dataset,)], indirect=True)
-    def test_post_success_streaming(
-        self, mock_ns, mock_svc_cls, mock_current_user, mock_gen_svc, mock_helper, app, sqlite_session: Session
-    ):
+    def test_post_success_streaming(self, mock_ns, mock_svc_cls, mock_current_user, mock_gen_svc, mock_helper, app):
         """Test successful pipeline run with streaming response."""
         tenant_id = str(uuid.uuid4())
         dataset_id = str(uuid.uuid4())
 
-        _persist_dataset(sqlite_session, tenant_id=tenant_id, dataset_id=dataset_id)
+        session = Mock()
+        session.scalar.return_value = Mock()
 
         mock_ns.payload = {
             "inputs": {"key": "val"},
@@ -595,33 +577,33 @@ class TestPipelineRunApiPost:
 
         with app.test_request_context("/datasets/test/pipeline/run", method="POST"):
             api = PipelineRunApi()
-            response = api.post.__wrapped__(api, sqlite_session, tenant_id=tenant_id, dataset_id=dataset_id)
+            response = api.post.__wrapped__(api, session, tenant_id=tenant_id, dataset_id=dataset_id)
 
         assert response == {"result": "ok"}
-        mock_svc_cls.assert_called_once_with(sqlite_session)
+        mock_svc_cls.assert_called_once_with(session)
         mock_gen_svc.generate.assert_called_once()
 
-    @pytest.mark.parametrize("sqlite_session", [(Dataset,)], indirect=True)
-    def test_post_not_found(self, app: Flask, sqlite_session: Session):
+    def test_post_not_found(self, app: Flask):
         """Test NotFound when dataset check fails."""
+        session = Mock()
+        session.scalar.return_value = None
+
         with app.test_request_context("/datasets/test/pipeline/run", method="POST"):
             api = PipelineRunApi()
             with pytest.raises(NotFound):
                 api.post.__wrapped__(
                     api,
-                    sqlite_session,
+                    session,
                     tenant_id=str(uuid.uuid4()),
                     dataset_id=str(uuid.uuid4()),
                 )
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.current_user", new="not_account")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.service_api_ns")
-    @pytest.mark.parametrize("sqlite_session", [(Dataset,)], indirect=True)
-    def test_post_forbidden_non_account_user(self, mock_ns, app: Flask, sqlite_session: Session):
+    def test_post_forbidden_non_account_user(self, mock_ns, app: Flask):
         """Test Forbidden when current_user is not an Account."""
-        tenant_id = str(uuid.uuid4())
-        dataset_id = str(uuid.uuid4())
-        _persist_dataset(sqlite_session, tenant_id=tenant_id, dataset_id=dataset_id)
+        session = Mock()
+        session.scalar.return_value = Mock()
         mock_ns.payload = {
             "inputs": {},
             "datasource_type": "online_document",
@@ -636,9 +618,9 @@ class TestPipelineRunApiPost:
             with pytest.raises(Forbidden):
                 api.post.__wrapped__(
                     api,
-                    sqlite_session,
-                    tenant_id=tenant_id,
-                    dataset_id=dataset_id,
+                    session,
+                    tenant_id=str(uuid.uuid4()),
+                    dataset_id=str(uuid.uuid4()),
                 )
 
 

api/tests/unit_tests/controllers/service_api/test_wraps.py

@@ -3,13 +3,10 @@ Unit tests for Service API wraps (authentication decorators)
 """
 
 import uuid
-from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, patch
 
 import pytest
 from flask import Flask
-from sqlalchemy import select
-from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden, NotFound, Unauthorized
 
 from controllers.service_api.wraps import (
@@ -24,11 +21,12 @@ from controllers.service_api.wraps import (
     validate_dataset_token,
 )
 from enums.cloud_plan import CloudPlan
-from models import Account, Tenant, TenantAccountJoin
-from models.account import TenantAccountRole
-from models.dataset import Dataset, RateLimitLog
-from models.enums import ApiTokenType
-from models.model import ApiToken, App, AppMode, IconType
+from models.account import TenantStatus
+from models.model import ApiToken
+from tests.unit_tests.conftest import (
+    setup_mock_dataset_owner_execute_result,
+    setup_mock_tenant_owner_execute_result,
+)
 
 
 def _configure_current_app_mock(mock_current_app):
@@ -36,51 +34,6 @@ def _configure_current_app_mock(mock_current_app):
     mock_current_app._get_current_object = Mock(return_value=Mock())
 
 
-def _session_proxy(session: Session) -> MagicMock:
-    """Emulate Flask-SQLAlchemy's callable scoped-session proxy around a test session."""
-    proxy = MagicMock(wraps=session)
-    proxy.return_value = session
-    return proxy
-
-
-def _api_token(*, tenant_id: str, app_id: str | None = None, token_type: ApiTokenType) -> ApiToken:
-    return ApiToken(
-        id=str(uuid.uuid4()),
-        tenant_id=tenant_id,
-        app_id=app_id,
-        type=token_type,
-        token="test_token",
-    )
-
-
-def _persist_workspace(session: Session) -> tuple[Tenant, Account, TenantAccountJoin]:
-    tenant = Tenant(name="Workspace")
-    account = Account(name="Owner", email=f"owner-{uuid.uuid4()}@example.com")
-    membership = TenantAccountJoin(
-        tenant_id=tenant.id,
-        account_id=account.id,
-        current=True,
-        role=TenantAccountRole.OWNER,
-    )
-    session.add_all([tenant, account, membership])
-    session.commit()
-    return tenant, account, membership
-
-
-def _app_model(*, tenant_id: str, enable_api: bool = True) -> App:
-    return App(
-        id=str(uuid.uuid4()),
-        tenant_id=tenant_id,
-        name="Service API App",
-        mode=AppMode.CHAT,
-        icon_type=IconType.EMOJI,
-        icon="chat",
-        icon_background="#FFFFFF",
-        enable_site=False,
-        enable_api=enable_api,
-    )
-
-
 class TestValidateAndGetApiToken:
     """Test suite for validate_and_get_api_token function"""
 
@@ -117,24 +70,21 @@ class TestValidateAndGetApiToken:
     def test_valid_token_returns_api_token(self, mock_fetch_token, mock_cache_cls, mock_record_usage, app: Flask):
         """Test that valid token returns the ApiToken object."""
         # Arrange
-        api_token = _api_token(
-            tenant_id=str(uuid.uuid4()),
-            app_id=str(uuid.uuid4()),
-            token_type=ApiTokenType.APP,
-        )
-        api_token.token = "valid_token_123"
+        mock_api_token = Mock(spec=ApiToken)
+        mock_api_token.token = "valid_token_123"
+        mock_api_token.type = "app"
 
         mock_cache_instance = Mock()
         mock_cache_instance.get.return_value = None  # Cache miss
         mock_cache_cls.get = mock_cache_instance.get
-        mock_fetch_token.return_value = api_token
+        mock_fetch_token.return_value = mock_api_token
 
         # Act
         with app.test_request_context("/", method="GET", headers={"Authorization": "Bearer valid_token_123"}):
             result = validate_and_get_api_token("app")
 
         # Assert
-        assert result == api_token
+        assert result == mock_api_token
 
     @patch("controllers.service_api.wraps.record_token_usage")
     @patch("controllers.service_api.wraps.ApiTokenCache")
@@ -167,124 +117,116 @@ class TestValidateAppToken:
         return app
 
     @patch("controllers.service_api.wraps.user_logged_in")
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.current_app")
-    @pytest.mark.parametrize(
-        "sqlite_session",
-        [(App, ApiToken, Tenant, Account, TenantAccountJoin)],
-        indirect=True,
-    )
     def test_valid_app_token_allows_access(
-        self,
-        mock_current_app,
-        mock_validate_token,
-        mock_user_logged_in,
-        app: Flask,
-        sqlite_session: Session,
+        self, mock_current_app, mock_validate_token, mock_db, mock_user_logged_in, app
     ):
         """Test that valid app token allows access to decorated view."""
         # Arrange
         _configure_current_app_mock(mock_current_app)
 
-        tenant, account, _ = _persist_workspace(sqlite_session)
-        app_model = _app_model(tenant_id=tenant.id)
-        api_token = _api_token(tenant_id=tenant.id, app_id=app_model.id, token_type=ApiTokenType.APP)
-        sqlite_session.add_all([app_model, api_token])
-        sqlite_session.commit()
-        mock_validate_token.return_value = api_token
+        mock_api_token = Mock()
+        mock_api_token.app_id = str(uuid.uuid4())
+        mock_api_token.tenant_id = str(uuid.uuid4())
+        mock_validate_token.return_value = mock_api_token
+
+        mock_app = Mock()
+        mock_app.id = mock_api_token.app_id
+        mock_app.status = "normal"
+        mock_app.enable_api = True
+        mock_app.tenant_id = mock_api_token.tenant_id
+
+        mock_tenant = Mock()
+        mock_tenant.status = TenantStatus.NORMAL
+        mock_tenant.id = mock_api_token.tenant_id
+
+        mock_account = Mock()
+        mock_account.id = str(uuid.uuid4())
+
+        # Use side_effect to return app first, then tenant via session.get()
+        mock_db.session.get.side_effect = [mock_app, mock_tenant]
+
+        # Mock the tenant owner execute result (execute(select(...)).one_or_none())
+        setup_mock_tenant_owner_execute_result(mock_db, mock_tenant, mock_account)
 
         @validate_app_token
         def protected_view(app_model):
             return {"success": True, "app_id": app_model.id}
 
         # Act
-        with (
-            app.test_request_context("/", method="GET", headers={"Authorization": "Bearer test_token"}),
-            patch("controllers.service_api.wraps.db.session", _session_proxy(sqlite_session)),
-        ):
+        with app.test_request_context("/", method="GET", headers={"Authorization": "Bearer test_token"}):
             result = protected_view()
 
         # Assert
         assert result["success"] is True
-        assert result["app_id"] == app_model.id
-        assert account.current_tenant_id == tenant.id
+        assert result["app_id"] == mock_app.id
 
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    @pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
-    def test_app_not_found_raises_forbidden(self, mock_validate_token, app: Flask, sqlite_session: Session):
+    def test_app_not_found_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app no longer exists."""
         # Arrange
-        api_token = _api_token(
-            tenant_id=str(uuid.uuid4()),
-            app_id=str(uuid.uuid4()),
-            token_type=ApiTokenType.APP,
-        )
-        mock_validate_token.return_value = api_token
+        mock_api_token = Mock()
+        mock_api_token.app_id = str(uuid.uuid4())
+        mock_validate_token.return_value = mock_api_token
+
+        mock_db.session.get.return_value = None
 
         @validate_app_token
         def protected_view(**kwargs):
             return {"success": True}
 
         # Act & Assert
-        with (
-            app.test_request_context("/", method="GET"),
-            patch("controllers.service_api.wraps.db.session", sqlite_session),
-        ):
+        with app.test_request_context("/", method="GET"):
             with pytest.raises(Forbidden) as exc_info:
                 protected_view()
             assert "no longer exists" in str(exc_info.value)
 
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    @pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
-    def test_app_status_abnormal_raises_forbidden(self, mock_validate_token, app: Flask, sqlite_session: Session):
+    def test_app_status_abnormal_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app status is abnormal."""
         # Arrange
-        app_model = _app_model(tenant_id=str(uuid.uuid4()))
-        sqlite_session.add(app_model)
-        sqlite_session.commit()
-        app_model.status = "abnormal"
-        mock_validate_token.return_value = _api_token(
-            tenant_id=app_model.tenant_id,
-            app_id=app_model.id,
-            token_type=ApiTokenType.APP,
-        )
+        mock_api_token = Mock()
+        mock_api_token.app_id = str(uuid.uuid4())
+        mock_validate_token.return_value = mock_api_token
+
+        mock_app = Mock()
+        mock_app.status = "abnormal"
+        mock_db.session.get.return_value = mock_app
 
         @validate_app_token
         def protected_view(**kwargs):
             return {"success": True}
 
         # Act & Assert
-        with (
-            app.test_request_context("/", method="GET"),
-            patch("controllers.service_api.wraps.db.session", sqlite_session),
-        ):
+        with app.test_request_context("/", method="GET"):
             with pytest.raises(Forbidden) as exc_info:
                 protected_view()
             assert "status is abnormal" in str(exc_info.value)
 
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    @pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
-    def test_app_api_disabled_raises_forbidden(self, mock_validate_token, app: Flask, sqlite_session: Session):
+    def test_app_api_disabled_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app API is disabled."""
         # Arrange
-        app_model = _app_model(tenant_id=str(uuid.uuid4()), enable_api=False)
-        sqlite_session.add(app_model)
-        sqlite_session.commit()
-        mock_validate_token.return_value = _api_token(
-            tenant_id=app_model.tenant_id,
-            app_id=app_model.id,
-            token_type=ApiTokenType.APP,
-        )
+        mock_api_token = Mock()
+        mock_api_token.app_id = str(uuid.uuid4())
+        mock_validate_token.return_value = mock_api_token
+
+        mock_app = Mock()
+        mock_app.status = "normal"
+        mock_app.enable_api = False
+        mock_db.session.get.return_value = mock_app
 
         @validate_app_token
         def protected_view(**kwargs):
             return {"success": True}
 
         # Act & Assert
-        with (
-            app.test_request_context("/", method="GET"),
-            patch("controllers.service_api.wraps.db.session", sqlite_session),
-        ):
+        with app.test_request_context("/", method="GET"):
             with pytest.raises(Forbidden) as exc_info:
                 protected_view()
             assert "API service has been disabled" in str(exc_info.value)
@@ -526,35 +468,26 @@ class TestCloudEditionBillingRateLimitCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_knowledge_rate_limit")
-    @pytest.mark.parametrize("sqlite_session", [(RateLimitLog,)], indirect=True)
+    @patch("controllers.service_api.wraps.db")
+    @patch("controllers.service_api.wraps.sessionmaker")
     def test_rejects_over_rate_limit(
-        self,
-        mock_get_rate_limit,
-        mock_validate_token,
-        app: Flask,
-        sqlite_session: Session,
+        self, mock_sessionmaker, mock_db, mock_get_rate_limit, mock_validate_token, app: Flask
     ):
         """Test that Forbidden is raised when over rate limit."""
         # Arrange
-        tenant_id = str(uuid.uuid4())
-        mock_validate_token.return_value = _api_token(
-            tenant_id=tenant_id,
-            token_type=ApiTokenType.DATASET,
-        )
+        mock_validate_token.return_value = Mock(tenant_id="tenant123")
 
         mock_rate_limit = Mock()
         mock_rate_limit.enabled = True
         mock_rate_limit.limit = 10
         mock_rate_limit.subscription_plan = "pro"
         mock_get_rate_limit.return_value = mock_rate_limit
+        rate_limit_log_session = MagicMock()
+        session_factory = MagicMock()
+        session_factory.begin.return_value.__enter__.return_value = rate_limit_log_session
+        mock_sessionmaker.return_value = session_factory
 
-        with (
-            patch("controllers.service_api.wraps.redis_client") as mock_redis,
-            patch(
-                "controllers.service_api.wraps.db",
-                SimpleNamespace(engine=sqlite_session.get_bind()),
-            ),
-        ):
+        with patch("controllers.service_api.wraps.redis_client") as mock_redis:
             mock_redis.zcard.return_value = 15  # Over limit
 
             @cloud_edition_billing_rate_limit_check("knowledge", "dataset")
@@ -566,12 +499,9 @@ class TestCloudEditionBillingRateLimitCheck:
                 with pytest.raises(Forbidden) as exc_info:
                     knowledge_request()
                 assert "rate limit" in str(exc_info.value)
-
-        persisted_logs = sqlite_session.scalars(select(RateLimitLog)).all()
-        assert len(persisted_logs) == 1
-        assert persisted_logs[0].tenant_id == tenant_id
-        assert persisted_logs[0].subscription_plan == "pro"
-        assert persisted_logs[0].operation == "knowledge"
+            mock_sessionmaker.assert_called_once_with(bind=mock_db.engine, expire_on_commit=False)
+            rate_limit_log_session.add.assert_called_once()
+            mock_db.session.commit.assert_not_called()
 
 
 class TestValidateDatasetToken:
@@ -585,62 +515,65 @@ class TestValidateDatasetToken:
         return app
 
     @patch("controllers.service_api.wraps.user_logged_in")
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.current_app")
-    @pytest.mark.parametrize(
-        "sqlite_session",
-        [(Tenant, Account, TenantAccountJoin)],
-        indirect=True,
-    )
-    def test_valid_dataset_token(
-        self,
-        mock_current_app,
-        mock_validate_token,
-        mock_user_logged_in,
-        app: Flask,
-        sqlite_session: Session,
-    ):
+    def test_valid_dataset_token(self, mock_current_app, mock_validate_token, mock_db, mock_user_logged_in, app: Flask):
         """Test that valid dataset token allows access."""
         # Arrange
         _configure_current_app_mock(mock_current_app)
 
-        tenant, account, _ = _persist_workspace(sqlite_session)
-        api_token = _api_token(tenant_id=tenant.id, token_type=ApiTokenType.DATASET)
-        mock_validate_token.return_value = api_token
+        tenant_id = str(uuid.uuid4())
+        mock_api_token = Mock()
+        mock_api_token.tenant_id = tenant_id
+        mock_validate_token.return_value = mock_api_token
+
+        mock_tenant = Mock()
+        mock_tenant.id = tenant_id
+        mock_tenant.status = TenantStatus.NORMAL
+
+        mock_ta = Mock()
+        mock_ta.account_id = str(uuid.uuid4())
+
+        mock_account = Mock()
+        mock_account.id = mock_ta.account_id
+        mock_account.current_tenant = mock_tenant
+
+        # Mock the tenant account join query (execute(select(...)).one_or_none())
+        setup_mock_dataset_owner_execute_result(mock_db, mock_tenant, mock_ta)
+
+        # Mock the account lookup via session.get()
+        mock_db.session.get.return_value = mock_account
 
         @validate_dataset_token
         def protected_view(tenant_id):
             return {"success": True, "tenant_id": tenant_id}
 
         # Act
-        with (
-            app.test_request_context("/", method="GET", headers={"Authorization": "Bearer test_token"}),
-            patch("controllers.service_api.wraps.db.session", _session_proxy(sqlite_session)),
-        ):
+        with app.test_request_context("/", method="GET", headers={"Authorization": "Bearer test_token"}):
             result = protected_view()
 
         # Assert
         assert result["success"] is True
-        assert result["tenant_id"] == tenant.id
-        assert account.current_tenant_id == tenant.id
+        assert result["tenant_id"] == tenant_id
 
+    @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    @pytest.mark.parametrize("sqlite_session", [(Dataset,)], indirect=True)
-    def test_dataset_not_found_raises_not_found(self, mock_validate_token, app: Flask, sqlite_session: Session):
+    def test_dataset_not_found_raises_not_found(self, mock_validate_token, mock_db, app: Flask):
         """Test that NotFound is raised when dataset doesn't exist."""
         # Arrange
-        api_token = _api_token(tenant_id=str(uuid.uuid4()), token_type=ApiTokenType.DATASET)
-        mock_validate_token.return_value = api_token
+        mock_api_token = Mock()
+        mock_api_token.tenant_id = str(uuid.uuid4())
+        mock_validate_token.return_value = mock_api_token
+
+        mock_db.session.scalar.return_value = None
 
         @validate_dataset_token
         def protected_view(dataset_id=None, **kwargs):
             return {"success": True}
 
         # Act & Assert
-        with (
-            app.test_request_context("/", method="GET"),
-            patch("controllers.service_api.wraps.db.session", sqlite_session),
-        ):
+        with app.test_request_context("/", method="GET"):
             with pytest.raises(NotFound) as exc_info:
                 protected_view(dataset_id=str(uuid.uuid4()))
             assert "Dataset not found" in str(exc_info.value)

api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py

@@ -46,7 +46,7 @@ class TestAdvancedChatAppGeneratorValidation:
         with pytest.raises(ValueError, match="query must be a string"):
             generator.generate(
                 app_model=SimpleNamespace(),
-                workflow=SimpleNamespace(graph_dict={"nodes": []}),
+                workflow=SimpleNamespace(),
                 user=SimpleNamespace(),
                 args={"inputs": {}, "query": 123},
                 invoke_from=InvokeFrom.WEB_APP,
@@ -186,7 +186,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         result = generator.generate(
             app_model=SimpleNamespace(id="app", tenant_id="tenant"),
-            workflow=SimpleNamespace(features_dict={}, graph_dict={"nodes": []}),
+            workflow=SimpleNamespace(features_dict={}),
             user=user,
             args={
                 "query": "hello",
@@ -1209,7 +1209,7 @@ class TestAdvancedChatAppGeneratorInternals:
         monkeypatch.setattr(generator, "_generate", _fake_generate)
 
         app_model = SimpleNamespace(id="app", tenant_id="tenant")
-        workflow = SimpleNamespace(features_dict={}, graph_dict={"nodes": []})
+        workflow = SimpleNamespace(features_dict={})
         from models import Account
 
         user = Account(name="Tester", email="tester@example.com")
@@ -1289,7 +1289,7 @@ class TestAdvancedChatAppGeneratorInternals:
         monkeypatch.setattr(generator, "_generate", _fake_generate)
 
         app_model = SimpleNamespace(id="app", tenant_id="tenant")
-        workflow = SimpleNamespace(features_dict={}, graph_dict={"nodes": []})
+        workflow = SimpleNamespace(features_dict={})
         from models.model import EndUser
 
         user = EndUser(tenant_id="tenant", type="session", name="tester", session_id="session")

api/tests/unit_tests/core/app/apps/common/test_workflow_response_converter_resumption.py

@@ -22,7 +22,7 @@ def _build_converter() -> WorkflowResponseConverter:
         app_config=SimpleNamespace(app_id="app-1", tenant_id="tenant-1"),
         invoke_from=InvokeFrom.EXPLORE,
         files=[],
-        inputs={"userinput.files": []},
+        inputs={},
         workflow_execution_id="run-1",
         call_depth=0,
     )
@@ -54,17 +54,3 @@ def test_workflow_start_stream_response_carries_initial_reason():
         reason=WorkflowStartReason.INITIAL,
     )
     assert resp.data.reason is WorkflowStartReason.INITIAL
-
-
-def test_workflow_start_stream_response_exposes_only_canonical_file_input():
-    converter = _build_converter()
-
-    resp = converter.workflow_start_to_stream_response(
-        task_id="task-1",
-        workflow_run_id="run-1",
-        workflow_id="wf-1",
-        reason=WorkflowStartReason.INITIAL,
-    )
-
-    assert resp.data.inputs["userinput.files"] == []
-    assert "sys.files" not in resp.data.inputs

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

@@ -111,7 +111,7 @@ def test_generate_includes_parent_trace_context_in_extras(monkeypatch):
 
     result = generator.generate(
         app_model=SimpleNamespace(tenant_id="tenant-1", id="app-1"),
-        workflow=SimpleNamespace(features_dict={}, graph_dict={"nodes": []}),
+        workflow=SimpleNamespace(features_dict={}),
         user=SimpleNamespace(id="user-1", session_id="session-1"),
         args={
             "inputs": {"query": "hello"},

api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py

@@ -377,7 +377,7 @@ class TestWorkflowAppGeneratorGenerate:
 
         result = generator.generate(
             app_model=SimpleNamespace(id="app", tenant_id="tenant"),
-            workflow=SimpleNamespace(features_dict={}, graph_dict={"nodes": []}),
+            workflow=SimpleNamespace(features_dict={}),
             user=SimpleNamespace(id="user", session_id="session"),
             args={"inputs": {}, SKIP_PREPARE_USER_INPUTS_KEY: True},
             invoke_from=InvokeFrom.WEB_APP,

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

@@ -26,7 +26,6 @@ class TestPlannerSystemPrompt:
         """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
-        assert "userinput.files" in PLANNER_SYSTEM_PROMPT
 
 
 class TestFormatIdealOutputSection:
@@ -76,9 +75,6 @@ class TestNodeBuilderPrompt:
         assert '"viewport":' not in prompt
         assert '"positionAbsolute":' not in prompt
 
-    def test_start_uses_user_input_files(self):
-        assert "userinput.files" in get_node_builder_system_prompt("start")
-
     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")
@@ -134,19 +130,17 @@ class TestNodeBuilderUserSections:
 
 
 class TestModeSection:
-    def test_advanced_chat_documents_built_in_variables(self):
+    def test_advanced_chat_documents_system_variables(self):
         out = format_mode_section("advanced-chat")
 
         assert "sys.query" in out
-        assert "userinput.files" in out
-        assert '["userinput", "files"]' in out
+        assert '["sys", "query"]' in out
         assert "do NOT invent start-node variables" in out
 
-    def test_workflow_mode_documents_file_input(self):
+    def test_workflow_mode_forbids_system_variables(self):
         out = format_mode_section("workflow")
 
-        assert "userinput.files" in out
-        assert "start node's declared variables" in out
+        assert "NO automatic system variables" in out
 
 
 class TestExistingGraphSection:

api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py

@@ -228,12 +228,12 @@ def _previous_node_prompt_payload(result, selector: str) -> object:
 
 
 def _uploaded_workflow_files_prompt_payload(result) -> object:
-    prefix = "  - userinput.files: "
+    prefix = "  - sys.files: "
     user_prompt = _workflow_user_prompt(result)
     for line in user_prompt.splitlines():
         if line.startswith(prefix):
             return json.loads(line.removeprefix(prefix))
-    raise AssertionError("missing prompt payload for userinput.files")
+    raise AssertionError("missing prompt payload for sys.files")
 
 
 def test_builds_create_run_request_from_agent_soul_and_node_job():

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

@@ -1,161 +0,0 @@
-from core.workflow.legacy_system_files import (
-    LegacySysFilesCompatVariable,
-    attach_legacy_sys_files_warning,
-    migrate_legacy_sys_files_graph_with_result,
-    normalize_legacy_sys_files_args,
-    resolve_legacy_sys_files_compat_variable,
-)
-
-_LEGACY_NODE_ID = "sys"
-_LEGACY_ALIAS_NODE_ID = "userinput"
-_LEGACY_VARIABLE_NAME = "files"
-_LEGACY_SELECTOR = [_LEGACY_NODE_ID, _LEGACY_VARIABLE_NAME]
-_LEGACY_TEMPLATE = "{{#" + ".".join((_LEGACY_NODE_ID, _LEGACY_VARIABLE_NAME)) + "#}}"
-_LEGACY_ALIAS_SELECTOR = [_LEGACY_ALIAS_NODE_ID, _LEGACY_VARIABLE_NAME]
-_LEGACY_ALIAS_TEMPLATE = "{{#" + ".".join((_LEGACY_ALIAS_NODE_ID, _LEGACY_VARIABLE_NAME)) + "#}}"
-_LEGACY_ALIAS_INPUT_KEY = ".".join((_LEGACY_ALIAS_NODE_ID, _LEGACY_VARIABLE_NAME))
-
-
-def test_migrate_legacy_sys_files_graph_ignores_invalid_or_unrelated_graphs():
-    assert not migrate_legacy_sys_files_graph_with_result({}).changed
-    assert not migrate_legacy_sys_files_graph_with_result({"nodes": [], "edges": [_LEGACY_SELECTOR]}).changed
-    assert not migrate_legacy_sys_files_graph_with_result({"nodes": [{"data": {"value": ["sys", "query"]}}]}).changed
-
-
-def test_migrate_legacy_sys_files_graph_rewrites_sys_files_to_userinput_files_without_start_variable():
-    graph = {
-        "nodes": [
-            {"id": "start", "data": {"type": "start", "variables": [{"variable": "sys_files"}]}},
-            {
-                "id": "answer",
-                "data": {
-                    "type": "answer",
-                    "answer": _LEGACY_SELECTOR,
-                    "template": _LEGACY_TEMPLATE,
-                },
-            },
-        ],
-    }
-
-    result = migrate_legacy_sys_files_graph_with_result(graph)
-
-    assert result.changed
-    start_data = result.graph["nodes"][0]["data"]
-    assert start_data["variables"] == [{"variable": "sys_files"}]
-    assert result.graph["nodes"][1]["data"]["answer"] == _LEGACY_ALIAS_SELECTOR
-    assert result.graph["nodes"][1]["data"]["template"] == _LEGACY_ALIAS_TEMPLATE
-    assert graph["nodes"][1]["data"]["answer"] == _LEGACY_SELECTOR
-    assert graph["nodes"][1]["data"]["template"] == _LEGACY_TEMPLATE
-
-
-def test_migrate_legacy_sys_files_graph_leaves_userinput_files_target_unchanged():
-    graph = {
-        "nodes": [
-            {"id": "start", "data": {"type": "start", "variables": []}},
-            {
-                "id": "answer",
-                "data": {
-                    "type": "answer",
-                    "answer": _LEGACY_ALIAS_SELECTOR,
-                    "template": _LEGACY_ALIAS_TEMPLATE,
-                },
-            },
-        ],
-    }
-
-    result = migrate_legacy_sys_files_graph_with_result(graph)
-
-    assert not result.changed
-    assert result.graph == graph
-
-
-def test_resolve_legacy_sys_files_compat_variable_returns_userinput_files_target():
-    assert resolve_legacy_sys_files_compat_variable({}) is None
-    assert resolve_legacy_sys_files_compat_variable({"nodes": [{"data": {"value": ["sys", "query"]}}]}) is None
-
-    compat_variable = resolve_legacy_sys_files_compat_variable({"nodes": [{"data": {"value": _LEGACY_SELECTOR}}]})
-
-    assert compat_variable == LegacySysFilesCompatVariable(
-        node_id=_LEGACY_ALIAS_NODE_ID,
-        variable_name=_LEGACY_VARIABLE_NAME,
-    )
-    assert (
-        resolve_legacy_sys_files_compat_variable({"nodes": [{"data": {"value": _LEGACY_ALIAS_SELECTOR}}]})
-        == compat_variable
-    )
-
-
-def test_normalize_legacy_sys_files_args_handles_no_compat_and_top_level_files():
-    args_without_legacy, compat_without_legacy = normalize_legacy_sys_files_args(
-        graph={"nodes": []},
-        args={"inputs": {}},
-    )
-    assert args_without_legacy == {"inputs": {}}
-    assert compat_without_legacy is None
-
-    files = [{"id": "file-1"}]
-    graph = {
-        "nodes": [
-            {"id": "start", "data": {"type": "start", "variables": []}},
-            {"id": "answer", "data": {"type": "answer", "answer": _LEGACY_TEMPLATE}},
-        ],
-    }
-    normalized_args, compat_variable = normalize_legacy_sys_files_args(
-        graph=graph,
-        args={"inputs": {}, "files": files},
-    )
-
-    assert compat_variable is not None
-    assert normalized_args["files"] == files
-    assert normalized_args["inputs"][".".join((compat_variable.node_id, compat_variable.variable_name))] == files
-
-
-def test_normalize_legacy_sys_files_args_maps_userinput_files_to_top_level_files_without_warning():
-    files = [{"id": "file-1"}]
-    normalized_args, compat_variable = normalize_legacy_sys_files_args(
-        graph={"nodes": []},
-        args={"inputs": {_LEGACY_ALIAS_INPUT_KEY: files}},
-    )
-
-    assert compat_variable is None
-    assert normalized_args["files"] == files
-    assert normalized_args["inputs"] == {_LEGACY_ALIAS_INPUT_KEY: files}
-
-
-def test_normalize_legacy_sys_files_args_prefers_userinput_files_over_legacy_files():
-    legacy_files = [{"id": "legacy-file"}]
-    userinput_files = [{"id": "userinput-file"}]
-
-    normalized_args, compat_variable = normalize_legacy_sys_files_args(
-        graph={"nodes": [{"data": {"type": "answer", "answer": _LEGACY_ALIAS_TEMPLATE}}]},
-        args={
-            "inputs": {_LEGACY_ALIAS_INPUT_KEY: userinput_files},
-            "files": legacy_files,
-        },
-    )
-
-    assert compat_variable is None
-    assert normalized_args["files"] == userinput_files
-
-
-def test_attach_legacy_sys_files_warning_wraps_stream_and_closes_source():
-    class CloseableStream:
-        closed = False
-
-        def __iter__(self):
-            yield "data: payload\n\n"
-
-        def close(self):
-            self.closed = True
-
-    stream = CloseableStream()
-    wrapped = attach_legacy_sys_files_warning(
-        stream,
-        LegacySysFilesCompatVariable(node_id=_LEGACY_ALIAS_NODE_ID, variable_name=_LEGACY_VARIABLE_NAME),
-    )
-
-    chunks = list(wrapped)
-
-    assert "warning" in chunks[0]
-    assert chunks[1] == "data: payload\n\n"
-    assert stream.closed

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

@@ -1,7 +1,6 @@
 from types import SimpleNamespace
 
 from core.workflow.system_variables import (
-    build_bootstrap_variables,
     build_system_variables,
     default_system_variables,
     get_node_creation_preload_selectors,
@@ -57,25 +56,6 @@ def test_build_system_variables_preserves_file_values():
     assert system_values["files"] == [file]
 
 
-def test_build_bootstrap_variables_adds_userinput_files_alias():
-    file = File(
-        file_type=FileType.DOCUMENT,
-        transfer_method=FileTransferMethod.LOCAL_FILE,
-        related_id="file-id",
-        filename="test.txt",
-        extension=".txt",
-        mime_type="text/plain",
-        size=1,
-        storage_key="storage-key",
-    )
-
-    bootstrap_variables = build_bootstrap_variables(system_variables=build_system_variables(files=[file]))
-    file_variables_by_selector = {tuple(variable.selector): variable for variable in bootstrap_variables}
-
-    assert file_variables_by_selector[("sys", "files")].value == [file]
-    assert file_variables_by_selector[("userinput", "files")].value == [file]
-
-
 def test_default_system_variables_generates_workflow_run_id():
     system_variables = default_system_variables()
     system_values = system_variables_to_mapping(system_variables)

api/tests/unit_tests/models/test_workflow.py

@@ -18,11 +18,6 @@ from models.workflow import (
     is_system_variable_editable,
 )
 
-_LEGACY_FILE_TEMPLATE = "{{#" + ".".join(("sys", "files")) + "#}}"
-_LEGACY_FILE_SELECTOR = ["sys", "files"]
-_USER_INPUT_FILE_TEMPLATE = "{{#" + ".".join(("userinput", "files")) + "#}}"
-_USER_INPUT_FILE_SELECTOR = ["userinput", "files"]
-
 
 def test_environment_variables():
     # tenant_id context variable removed - using current_user.current_tenant_id directly
@@ -250,144 +245,6 @@ class TestIsSystemVariableEditable:
         assert is_system_variable_editable("invalid_or_new_system_variable") == False
 
 
-class TestWorkflowLegacySysFilesCompatibility:
-    def _make_workflow(self, graph: dict, *, features: dict | None = None) -> Workflow:
-        return Workflow(
-            tenant_id="tenant_id",
-            app_id="app_id",
-            type="workflow",
-            version="draft",
-            graph=json.dumps(graph),
-            features=json.dumps(features or {}),
-            created_by="account_id",
-            environment_variables=[],
-            conversation_variables=[],
-        )
-
-    def test_graph_dict_rewrites_legacy_sys_files_references_to_userinput_files(self):
-        workflow = self._make_workflow(
-            {
-                "nodes": [
-                    {
-                        "id": "start",
-                        "data": {
-                            "type": "start",
-                            "title": "Start",
-                            "variables": [],
-                        },
-                    },
-                    {
-                        "id": "llm",
-                        "data": {
-                            "type": "llm",
-                            "prompt_template": [{"role": "user", "text": f"files: {_LEGACY_FILE_TEMPLATE}"}],
-                            "context": {"variable_selector": _LEGACY_FILE_SELECTOR},
-                        },
-                    },
-                ],
-                "edges": [],
-            }
-        )
-
-        stored_graph_before_read = workflow.graph
-
-        graph = workflow.graph_dict
-        start_node = next(node for node in graph["nodes"] if node["id"] == "start")
-        llm_node = next(node for node in graph["nodes"] if node["id"] == "llm")
-
-        assert start_node["data"]["variables"] == []
-        assert llm_node["data"]["prompt_template"][0]["text"] == f"files: {_USER_INPUT_FILE_TEMPLATE}"
-        assert llm_node["data"]["context"]["variable_selector"] == _USER_INPUT_FILE_SELECTOR
-
-        assert workflow.graph == stored_graph_before_read
-
-    def test_migrate_legacy_sys_files_graph_in_place_updates_stored_graph(self):
-        workflow = self._make_workflow(
-            {
-                "nodes": [
-                    {"id": "answer", "data": {"type": "answer", "answer": _LEGACY_FILE_TEMPLATE}},
-                ],
-                "edges": [],
-            }
-        )
-
-        assert workflow.migrate_legacy_sys_files_graph_in_place()
-        assert _LEGACY_FILE_TEMPLATE not in workflow.graph
-        assert _USER_INPUT_FILE_TEMPLATE in workflow.graph
-
-    def test_graph_dict_preserves_existing_start_variables_when_migrating_legacy_sys_files(self):
-        workflow = self._make_workflow(
-            {
-                "nodes": [
-                    {
-                        "id": "start",
-                        "data": {
-                            "type": "start",
-                            "title": "Start",
-                            "variables": [
-                                {"variable": "sys_files", "label": "Existing", "type": "text-input"},
-                            ],
-                        },
-                    },
-                    {
-                        "id": "answer",
-                        "data": {
-                            "type": "answer",
-                            "answer": _LEGACY_FILE_TEMPLATE,
-                        },
-                    },
-                ],
-                "edges": [],
-            }
-        )
-
-        graph = workflow.graph_dict
-        start_node = next(node for node in graph["nodes"] if node["id"] == "start")
-        answer_node = next(node for node in graph["nodes"] if node["id"] == "answer")
-
-        assert [variable["variable"] for variable in start_node["data"]["variables"]] == ["sys_files"]
-        assert answer_node["data"]["answer"] == _USER_INPUT_FILE_TEMPLATE
-
-    def test_graph_dict_leaves_userinput_files_references_unchanged(self):
-        workflow = self._make_workflow(
-            {
-                "nodes": [
-                    {
-                        "id": "start",
-                        "data": {
-                            "type": "start",
-                            "title": "Start",
-                            "variables": [],
-                        },
-                    },
-                    {
-                        "id": "answer",
-                        "data": {
-                            "type": "answer",
-                            "answer": _USER_INPUT_FILE_TEMPLATE,
-                        },
-                    },
-                ],
-                "edges": [],
-            },
-            features={
-                "file_upload": {
-                    "enabled": True,
-                    "allowed_file_upload_methods": ["remote_url"],
-                    "allowed_file_types": ["document", "custom"],
-                    "allowed_file_extensions": [".pdf"],
-                    "number_limits": 8,
-                }
-            },
-        )
-
-        graph = workflow.graph_dict
-        start_node = next(node for node in graph["nodes"] if node["id"] == "start")
-
-        assert start_node["data"]["variables"] == []
-        assert json.loads(workflow.graph) == graph
-
-
 class TestWorkflowDraftVariableGetValue:
     def test_get_value_by_case(self):
         @dataclasses.dataclass

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

@@ -1,105 +1,89 @@
 import logging
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
-from uuid import uuid4
 
 import pytest
-from sqlalchemy import select
-from sqlalchemy.orm import Session
 
 from models.account import (
     TenantPluginAutoUpgradeCategory,
     TenantPluginAutoUpgradeMode,
-    TenantPluginAutoUpgradeStrategy,
     TenantPluginAutoUpgradeStrategySetting,
 )
-from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 
 MODULE = "services.plugin.plugin_auto_upgrade_service"
 PLUGIN_CATEGORY = TenantPluginAutoUpgradeCategory.TOOL
-STRATEGY_MODELS = (TenantPluginAutoUpgradeStrategy,)
 
 
-def _strategy(
-    tenant_id: str,
-    *,
-    category: TenantPluginAutoUpgradeCategory = PLUGIN_CATEGORY,
-    setting: TenantPluginAutoUpgradeStrategySetting = TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
-    mode: TenantPluginAutoUpgradeMode = TenantPluginAutoUpgradeMode.EXCLUDE,
-    exclude: list[str] | None = None,
-    include: list[str] | None = None,
-    upgrade_time: int = 0,
-) -> TenantPluginAutoUpgradeStrategy:
-    return TenantPluginAutoUpgradeStrategy(
-        tenant_id=tenant_id,
-        category=category,
-        strategy_setting=setting,
-        upgrade_time_of_day=upgrade_time,
-        upgrade_mode=mode,
-        exclude_plugins=exclude or [],
-        include_plugins=include or [],
-    )
+def _patched_session():
+    """Return a mock SQLAlchemy session for service calls."""
+    session = MagicMock()
+    return session
 
 
 class TestGetStrategy:
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_returns_strategy_when_found(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        strategy = _strategy(tenant_id)
-        sqlite_session.add(strategy)
-        sqlite_session.commit()
+    def test_returns_strategy_when_found(self):
+        session = _patched_session()
+        strategy = MagicMock()
+        session.scalar.return_value = strategy
 
-        result = PluginAutoUpgradeService.get_strategy(tenant_id, PLUGIN_CATEGORY, session=sqlite_session)
+        from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+        result = PluginAutoUpgradeService.get_strategy("t1", PLUGIN_CATEGORY, session=session)
 
         assert result is strategy
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_returns_none_when_not_found(self, sqlite_session: Session) -> None:
-        assert PluginAutoUpgradeService.get_strategy(str(uuid4()), PLUGIN_CATEGORY, session=sqlite_session) is None
+    def test_returns_none_when_not_found(self):
+        session = _patched_session()
+        session.scalar.return_value = None
+
+        from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+        result = PluginAutoUpgradeService.get_strategy("t1", PLUGIN_CATEGORY, session=session)
+
+        assert result is None
 
 
 class TestChangeStrategy:
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_creates_new_strategy(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
+    def test_creates_new_strategy(self):
+        session = _patched_session()
+        session.scalar.return_value = None
 
-        result = PluginAutoUpgradeService.change_strategy(
-            tenant_id,
-            TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
-            3,
-            TenantPluginAutoUpgradeMode.ALL,
-            [],
-            [],
-            category=PLUGIN_CATEGORY,
-            session=sqlite_session,
-        )
+        with patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy") as strat_cls:
+            strat_cls.return_value = MagicMock()
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+            result = PluginAutoUpgradeService.change_strategy(
+                "t1",
+                TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
+                3,
+                TenantPluginAutoUpgradeMode.ALL,
+                [],
+                [],
+                category=PLUGIN_CATEGORY,
+                session=session,
+            )
 
-        strategy = sqlite_session.scalar(select(TenantPluginAutoUpgradeStrategy))
         assert result is True
-        assert strategy is not None
-        assert strategy.tenant_id == tenant_id
-        assert strategy.upgrade_time_of_day == 3
-        assert strategy.upgrade_mode == TenantPluginAutoUpgradeMode.ALL
+        session.add.assert_called_once()
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_updates_existing_strategy(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        existing = _strategy(tenant_id)
-        sqlite_session.add(existing)
-        sqlite_session.commit()
+    def test_updates_existing_strategy(self):
+        session = _patched_session()
+        existing = MagicMock()
+        session.scalar.return_value = existing
+
+        from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 
         result = PluginAutoUpgradeService.change_strategy(
-            tenant_id,
+            "t1",
             TenantPluginAutoUpgradeStrategySetting.LATEST,
             5,
             TenantPluginAutoUpgradeMode.PARTIAL,
             ["p1"],
             ["p2"],
             category=PLUGIN_CATEGORY,
-            session=sqlite_session,
+            session=session,
         )
 
-        sqlite_session.refresh(existing)
         assert result is True
         assert existing.strategy_setting == TenantPluginAutoUpgradeStrategySetting.LATEST
         assert existing.upgrade_time_of_day == 5
@@ -109,115 +93,157 @@ class TestChangeStrategy:
 
 
 class TestExcludePlugin:
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_creates_default_strategy_when_none_exists(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
+    def test_creates_default_strategy_when_none_exists(self):
+        session = _patched_session()
+        session.scalar.return_value = None
 
-        result = PluginAutoUpgradeService.exclude_plugin(tenant_id, "plugin-1", PLUGIN_CATEGORY, session=sqlite_session)
+        with (
+            patch(f"{MODULE}.select"),
+            patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy"),
+        ):
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+            result = PluginAutoUpgradeService.exclude_plugin(
+                "t1",
+                "plugin-1",
+                PLUGIN_CATEGORY,
+                session=session,
+            )
 
-        strategy = sqlite_session.scalar(select(TenantPluginAutoUpgradeStrategy))
         assert result is True
-        assert strategy is not None
-        assert strategy.exclude_plugins == ["plugin-1"]
+        session.add.assert_called_once()
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_appends_to_exclude_list_in_exclude_mode(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        existing = _strategy(tenant_id, exclude=["p-existing"])
-        sqlite_session.add(existing)
-        sqlite_session.commit()
+    def test_appends_to_exclude_list_in_exclude_mode(self):
+        session = _patched_session()
+        existing = MagicMock()
+        existing.upgrade_mode = TenantPluginAutoUpgradeMode.EXCLUDE
+        existing.exclude_plugins = ["p-existing"]
+        session.scalar.return_value = existing
 
-        PluginAutoUpgradeService.exclude_plugin(tenant_id, "p-new", PLUGIN_CATEGORY, session=sqlite_session)
+        with patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy") as strat_cls:
+            strat_cls.UpgradeMode.EXCLUDE = "exclude"
+            strat_cls.UpgradeMode.PARTIAL = "partial"
+            strat_cls.UpgradeMode.ALL = "all"
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 
-        sqlite_session.refresh(existing)
+            result = PluginAutoUpgradeService.exclude_plugin("t1", "p-new", PLUGIN_CATEGORY, session=session)
+
+        assert result is True
         assert existing.exclude_plugins == ["p-existing", "p-new"]
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_removes_from_include_list_in_partial_mode(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        existing = _strategy(tenant_id, mode=TenantPluginAutoUpgradeMode.PARTIAL, include=["p1", "p2"])
-        sqlite_session.add(existing)
-        sqlite_session.commit()
+    def test_removes_from_include_list_in_partial_mode(self):
+        session = _patched_session()
+        existing = MagicMock()
+        existing.upgrade_mode = TenantPluginAutoUpgradeMode.PARTIAL
+        existing.include_plugins = ["p1", "p2"]
+        session.scalar.return_value = existing
 
-        PluginAutoUpgradeService.exclude_plugin(tenant_id, "p1", PLUGIN_CATEGORY, session=sqlite_session)
+        with patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy") as strat_cls:
+            strat_cls.UpgradeMode.EXCLUDE = "exclude"
+            strat_cls.UpgradeMode.PARTIAL = "partial"
+            strat_cls.UpgradeMode.ALL = "all"
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 
-        sqlite_session.refresh(existing)
+            result = PluginAutoUpgradeService.exclude_plugin("t1", "p1", PLUGIN_CATEGORY, session=session)
+
+        assert result is True
         assert existing.include_plugins == ["p2"]
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_switches_to_exclude_mode_from_all(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        existing = _strategy(tenant_id, mode=TenantPluginAutoUpgradeMode.ALL)
-        sqlite_session.add(existing)
-        sqlite_session.commit()
+    def test_switches_to_exclude_mode_from_all(self):
+        session = _patched_session()
+        existing = MagicMock()
+        existing.upgrade_mode = TenantPluginAutoUpgradeMode.ALL
+        session.scalar.return_value = existing
 
-        PluginAutoUpgradeService.exclude_plugin(tenant_id, "p1", PLUGIN_CATEGORY, session=sqlite_session)
+        with patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy") as strat_cls:
+            strat_cls.UpgradeMode.EXCLUDE = "exclude"
+            strat_cls.UpgradeMode.PARTIAL = "partial"
+            strat_cls.UpgradeMode.ALL = "all"
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
 
-        sqlite_session.refresh(existing)
+            result = PluginAutoUpgradeService.exclude_plugin("t1", "p1", PLUGIN_CATEGORY, session=session)
+
+        assert result is True
         assert existing.upgrade_mode == TenantPluginAutoUpgradeMode.EXCLUDE
         assert existing.exclude_plugins == ["p1"]
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_no_duplicate_in_exclude_list(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        existing = _strategy(tenant_id, exclude=["p1"])
-        sqlite_session.add(existing)
-        sqlite_session.commit()
+    def test_no_duplicate_in_exclude_list(self):
+        session = _patched_session()
+        existing = MagicMock()
+        existing.upgrade_mode = TenantPluginAutoUpgradeMode.EXCLUDE
+        existing.exclude_plugins = ["p1"]
+        session.scalar.return_value = existing
 
-        PluginAutoUpgradeService.exclude_plugin(tenant_id, "p1", PLUGIN_CATEGORY, session=sqlite_session)
+        with patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginAutoUpgradeStrategy") as strat_cls:
+            strat_cls.UpgradeMode.EXCLUDE = "exclude"
+            strat_cls.UpgradeMode.PARTIAL = "partial"
+            strat_cls.UpgradeMode.ALL = "all"
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+            PluginAutoUpgradeService.exclude_plugin("t1", "p1", PLUGIN_CATEGORY, session=session)
 
-        sqlite_session.refresh(existing)
         assert existing.exclude_plugins == ["p1"]
 
 
 class TestBackfillStrategyCategories:
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_creates_default_missing_categories_without_fetching_daemon(self, sqlite_session: Session) -> None:
-        tenant_id = str(uuid4())
-        tool_strategy = _strategy(tenant_id)
-        sqlite_session.add(tool_strategy)
-        sqlite_session.commit()
+    def test_creates_default_missing_categories_without_fetching_daemon(self):
+        session = _patched_session()
+        tool_strategy = SimpleNamespace(
+            category=TenantPluginAutoUpgradeCategory.TOOL,
+            strategy_setting=TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
+            upgrade_time_of_day=0,
+            upgrade_mode=TenantPluginAutoUpgradeMode.EXCLUDE,
+            exclude_plugins=[],
+            include_plugins=[],
+        )
+        session.scalars.return_value.all.return_value = [tool_strategy]
         installer = MagicMock()
 
         with patch(f"{MODULE}.PluginInstaller", return_value=installer):
-            result = PluginAutoUpgradeService.backfill_strategy_categories(tenant_id, session=sqlite_session)
-            expected_time = PluginAutoUpgradeService.default_upgrade_time_of_day(tenant_id)
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+            result = PluginAutoUpgradeService.backfill_strategy_categories("t1", session=session)
+            expected_time = PluginAutoUpgradeService.default_upgrade_time_of_day("t1")
 
-        strategies = list(sqlite_session.scalars(select(TenantPluginAutoUpgradeStrategy)).all())
         assert result.created_count == len(TenantPluginAutoUpgradeCategory) - 1
         assert result.normalized is False
         installer.list_plugins.assert_not_called()
-        assert len(strategies) == len(TenantPluginAutoUpgradeCategory)
         assert tool_strategy.upgrade_time_of_day == expected_time
+        created_strategies = [call.args[0] for call in session.add.call_args_list]
         model_strategy = next(
-            strategy for strategy in strategies if strategy.category == TenantPluginAutoUpgradeCategory.MODEL
+            strategy for strategy in created_strategies if strategy.category == TenantPluginAutoUpgradeCategory.MODEL
         )
         assert model_strategy.strategy_setting == TenantPluginAutoUpgradeStrategySetting.LATEST
         assert model_strategy.upgrade_time_of_day == expected_time
 
-    def test_default_upgrade_time_is_aligned_to_fifteen_minutes(self) -> None:
-        default_time = PluginAutoUpgradeService.default_upgrade_time_of_day(str(uuid4()))
+    def test_default_upgrade_time_is_aligned_to_fifteen_minutes(self):
+        from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+        default_time = PluginAutoUpgradeService.default_upgrade_time_of_day("t1")
+
         assert default_time % (15 * 60) == 0
         assert 0 <= default_time < 24 * 60 * 60
 
-    @pytest.mark.parametrize("sqlite_session", [STRATEGY_MODELS], indirect=True)
-    def test_creates_missing_categories_and_splits_known_plugins(
-        self, sqlite_session: Session, caplog: pytest.LogCaptureFixture
-    ) -> None:
-        tenant_id = str(uuid4())
-        tool_strategy = _strategy(
-            tenant_id,
-            exclude=["tool-plugin", "model-plugin", "unknown-plugin"],
-            include=["model-plugin", "tool-plugin"],
+    def test_creates_missing_categories_and_splits_known_plugins(self, caplog: pytest.LogCaptureFixture):
+        session = _patched_session()
+        tool_strategy = SimpleNamespace(
+            category=TenantPluginAutoUpgradeCategory.TOOL,
+            strategy_setting=TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
+            upgrade_time_of_day=0,
+            upgrade_mode=TenantPluginAutoUpgradeMode.EXCLUDE,
+            exclude_plugins=["tool-plugin", "model-plugin", "unknown-plugin"],
+            include_plugins=["model-plugin", "tool-plugin"],
         )
-        model_strategy = _strategy(
-            tenant_id,
+        model_strategy = SimpleNamespace(
             category=TenantPluginAutoUpgradeCategory.MODEL,
-            exclude=["tool-plugin", "model-plugin", "unknown-plugin"],
-            include=["model-plugin", "tool-plugin"],
+            strategy_setting=TenantPluginAutoUpgradeStrategySetting.FIX_ONLY,
+            upgrade_time_of_day=0,
+            upgrade_mode=TenantPluginAutoUpgradeMode.EXCLUDE,
+            exclude_plugins=["tool-plugin", "model-plugin", "unknown-plugin"],
+            include_plugins=["model-plugin", "tool-plugin"],
         )
-        sqlite_session.add_all([tool_strategy, model_strategy])
-        sqlite_session.commit()
+        session.scalars.return_value.all.return_value = [tool_strategy, model_strategy]
+
         installed_plugins = [
             SimpleNamespace(
                 plugin_id="tool-plugin",
@@ -235,17 +261,18 @@ class TestBackfillStrategyCategories:
             patch(f"{MODULE}.PluginInstaller", return_value=installer),
             caplog.at_level(logging.WARNING, logger=MODULE),
         ):
-            result = PluginAutoUpgradeService.backfill_strategy_categories(tenant_id, session=sqlite_session)
+            from services.plugin.plugin_auto_upgrade_service import PluginAutoUpgradeService
+
+            result = PluginAutoUpgradeService.backfill_strategy_categories("t1", session=session)
 
-        strategies = list(sqlite_session.scalars(select(TenantPluginAutoUpgradeStrategy)).all())
         assert result.created_count == len(TenantPluginAutoUpgradeCategory) - 2
         assert result.normalized is True
-        assert len(strategies) == len(TenantPluginAutoUpgradeCategory)
+        assert session.add.call_count == len(TenantPluginAutoUpgradeCategory) - 2
         assert tool_strategy.exclude_plugins == ["tool-plugin"]
         assert tool_strategy.include_plugins == ["tool-plugin"]
         assert model_strategy.exclude_plugins == ["model-plugin"]
         assert model_strategy.include_plugins == ["model-plugin"]
         assert (
             "Skipped unknown plugin IDs while backfilling plugin auto-upgrade strategies: "
-            f"tenant_id={tenant_id}, field=exclude_plugins, plugin_ids=['unknown-plugin']" in caplog.messages
+            "tenant_id=t1, field=exclude_plugins, plugin_ids=['unknown-plugin']" in caplog.messages
         )

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

@@ -7,19 +7,28 @@ import pytest
 import zstandard
 from pydantic import TypeAdapter
 from redis import RedisError
-from sqlalchemy.orm import Session
 
-from core.helper.model_provider_cache import ProviderCredentialsCacheType
 from core.plugin.entities.plugin import PluginCategory, PluginInstallationSource
 from core.plugin.entities.plugin_daemon import PluginInstallTask, PluginInstallTaskStatus, PluginModelProviderEntity
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
-from models.provider import Provider, ProviderCredential, ProviderType, TenantPreferredModelProvider
 
 MODULE = "core.plugin.plugin_service"
-TENANT_ID = "11111111-1111-1111-1111-111111111111"
-OTHER_TENANT_ID = "22222222-2222-2222-2222-222222222222"
-USER_ID = "33333333-3333-3333-3333-333333333333"
+
+
+class _FakeSession:
+    def __init__(self) -> None:
+        self.execute = Mock()
+        self.scalars = Mock(return_value=SimpleNamespace(all=Mock(return_value=[])))
+
+    def __enter__(self) -> "_FakeSession":
+        return self
+
+    def __exit__(self, exc_type, exc, traceback) -> None:
+        return None
+
+    def begin(self) -> "_FakeSession":
+        return self
 
 
 def _build_provider_entity(provider: str = "openai") -> ProviderEntity:
@@ -1157,72 +1166,19 @@ class TestPluginModelProviderCacheInvalidation:
         assert result is True
         invalidate_cache.assert_called_once_with("tenant-1")
 
-    @pytest.mark.parametrize(
-        "sqlite_session", [(Provider, ProviderCredential, TenantPreferredModelProvider)], indirect=True
-    )
-    def test_uninstall_existing_plugin_invalidates_cache_after_credential_cleanup(
-        self, sqlite_session: Session
-    ) -> None:
+    def test_uninstall_existing_plugin_invalidates_cache_after_credential_cleanup(self) -> None:
         """Successful uninstall with plugin metadata also invalidates the mutated tenant provider cache."""
-        plugin_id = "langgenius/openai"
-        provider_name = f"{plugin_id}/openai"
         plugin = SimpleNamespace(
             installation_id="installation-1",
-            plugin_id=plugin_id,
+            plugin_id="langgenius/openai",
             plugin_unique_identifier="langgenius/openai:1.0.0",
         )
-        credential = ProviderCredential(
-            tenant_id=TENANT_ID,
-            provider_name=provider_name,
-            credential_name="Target credential",
-            encrypted_config="{}",
-            user_id=USER_ID,
-        )
-        other_credential = ProviderCredential(
-            tenant_id=OTHER_TENANT_ID,
-            provider_name=provider_name,
-            credential_name="Other credential",
-            encrypted_config="{}",
-            user_id=USER_ID,
-        )
-        sqlite_session.add_all([credential, other_credential])
-        sqlite_session.flush()
-        provider = Provider(
-            tenant_id=TENANT_ID,
-            provider_name=provider_name,
-            provider_type=ProviderType.CUSTOM,
-            credential_id=credential.id,
-        )
-        other_provider = Provider(
-            tenant_id=OTHER_TENANT_ID,
-            provider_name=provider_name,
-            provider_type=ProviderType.CUSTOM,
-            credential_id=other_credential.id,
-        )
-        preferred_provider = TenantPreferredModelProvider(
-            tenant_id=TENANT_ID,
-            provider_name=provider_name,
-            preferred_provider_type=ProviderType.CUSTOM,
-        )
-        other_preferred_provider = TenantPreferredModelProvider(
-            tenant_id=OTHER_TENANT_ID,
-            provider_name=provider_name,
-            preferred_provider_type=ProviderType.CUSTOM,
-        )
-        sqlite_session.add_all([provider, other_provider, preferred_provider, other_preferred_provider])
-        sqlite_session.commit()
-        credential_id = credential.id
-        other_credential_id = other_credential.id
-        provider_id = provider.id
-        other_provider_id = other_provider.id
-        preferred_provider_id = preferred_provider.id
-        other_preferred_provider_id = other_preferred_provider.id
-
+        session = _FakeSession()
         with (
-            patch(f"{MODULE}.db", SimpleNamespace(engine=sqlite_session.get_bind())),
+            patch(f"{MODULE}.db", SimpleNamespace(engine=object())),
             patch(f"{MODULE}.dify_config") as mock_config,
             patch(f"{MODULE}.PluginInstaller") as installer_cls,
-            patch(f"{MODULE}.ProviderCredentialsCache") as credentials_cache,
+            patch(f"{MODULE}.Session", return_value=session),
             patch(f"{MODULE}.PluginService.invalidate_plugin_model_providers_cache") as invalidate_cache,
         ):
             mock_config.ENTERPRISE_ENABLED = False
@@ -1232,26 +1188,8 @@ class TestPluginModelProviderCacheInvalidation:
 
             from core.plugin.plugin_service import PluginService
 
-            result = PluginService.uninstall(TENANT_ID, "installation-1")
+            result = PluginService.uninstall("tenant-1", "installation-1")
 
         assert result is True
-        installer.uninstall.assert_called_once_with(TENANT_ID, "installation-1")
-        invalidate_cache.assert_called_once_with(TENANT_ID)
-        credentials_cache.assert_called_once_with(
-            tenant_id=TENANT_ID,
-            identity_id=provider_id,
-            cache_type=ProviderCredentialsCacheType.PROVIDER,
-        )
-        credentials_cache.return_value.delete.assert_called_once_with()
-
-        sqlite_session.expunge_all()
-        assert sqlite_session.get(ProviderCredential, credential_id) is None
-        persisted_provider = sqlite_session.get(Provider, provider_id)
-        assert persisted_provider is not None
-        assert persisted_provider.credential_id is None
-        assert sqlite_session.get(TenantPreferredModelProvider, preferred_provider_id) is None
-        assert sqlite_session.get(ProviderCredential, other_credential_id) is not None
-        persisted_other_provider = sqlite_session.get(Provider, other_provider_id)
-        assert persisted_other_provider is not None
-        assert persisted_other_provider.credential_id == other_credential_id
-        assert sqlite_session.get(TenantPreferredModelProvider, other_preferred_provider_id) is not None
+        installer.uninstall.assert_called_once_with("tenant-1", "installation-1")
+        invalidate_cache.assert_called_once_with("tenant-1")

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

@@ -8,7 +8,6 @@ verification, marketplace upgrade flows, and uninstall with credential cleanup.
 from __future__ import annotations
 
 from collections.abc import Iterator
-from typing import cast
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
@@ -20,6 +19,7 @@ from sqlalchemy.orm import Session
 from core.plugin.entities.plugin import PluginInstallationSource
 from core.plugin.entities.plugin_daemon import PluginVerification
 from core.plugin.plugin_service import PluginService
+from enums.deployment_edition import DeploymentEdition
 from models import ProviderType
 from models.engine import db
 from models.provider import Provider, ProviderCredential, TenantPreferredModelProvider
@@ -27,16 +27,20 @@ from services.errors.plugin import PluginInstallationForbiddenError
 from services.feature_service import (
     PluginInstallationPermissionModel,
     PluginInstallationScope,
+    SystemFeatureModel,
 )
 
 
-def _make_permission(
+def _make_features(
     restrict_to_marketplace: bool = False,
     scope: PluginInstallationScope = PluginInstallationScope.ALL,
-) -> PluginInstallationPermissionModel:
-    return PluginInstallationPermissionModel(
-        restrict_to_marketplace_only=restrict_to_marketplace,
-        plugin_installation_scope=scope,
+) -> SystemFeatureModel:
+    return SystemFeatureModel(
+        deployment_edition=DeploymentEdition.COMMUNITY,
+        plugin_installation_permission=PluginInstallationPermissionModel(
+            restrict_to_marketplace_only=restrict_to_marketplace,
+            plugin_installation_scope=scope,
+        ),
     )
 
 
@@ -115,31 +119,22 @@ class TestFetchLatestPluginVersion:
 class TestCheckMarketplaceOnlyPermission:
     @patch("core.plugin.plugin_service.FeatureService")
     def test_raises_when_restricted(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(restrict_to_marketplace=True)
+        mock_fs.get_system_features.return_value = _make_features(restrict_to_marketplace=True)
 
         with pytest.raises(PluginInstallationForbiddenError):
             PluginService._check_marketplace_only_permission()
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_passes_when_not_restricted(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(restrict_to_marketplace=False)
+        mock_fs.get_system_features.return_value = _make_features(restrict_to_marketplace=False)
 
         PluginService._check_marketplace_only_permission()  # should not raise
 
-    @patch("core.plugin.plugin_service.FeatureService")
-    def test_raises_when_scope_denies_all(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(scope=PluginInstallationScope.NONE)
-
-        with pytest.raises(PluginInstallationForbiddenError, match="not allowed"):
-            PluginService._check_marketplace_only_permission()
-
 
 class TestCheckPluginInstallationScope:
     @patch("core.plugin.plugin_service.FeatureService")
     def test_official_only_allows_langgenius(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(
-            scope=PluginInstallationScope.OFFICIAL_ONLY
-        )
+        mock_fs.get_system_features.return_value = _make_features(scope=PluginInstallationScope.OFFICIAL_ONLY)
         verification = MagicMock()
         verification.authorized_category = PluginVerification.AuthorizedCategory.Langgenius
 
@@ -147,16 +142,14 @@ class TestCheckPluginInstallationScope:
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_official_only_rejects_third_party(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(
-            scope=PluginInstallationScope.OFFICIAL_ONLY
-        )
+        mock_fs.get_system_features.return_value = _make_features(scope=PluginInstallationScope.OFFICIAL_ONLY)
 
         with pytest.raises(PluginInstallationForbiddenError):
             PluginService._check_plugin_installation_scope(None)
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_official_and_partners_allows_partner(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(
+        mock_fs.get_system_features.return_value = _make_features(
             scope=PluginInstallationScope.OFFICIAL_AND_SPECIFIC_PARTNERS
         )
         verification = MagicMock()
@@ -166,7 +159,7 @@ class TestCheckPluginInstallationScope:
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_official_and_partners_rejects_none(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(
+        mock_fs.get_system_features.return_value = _make_features(
             scope=PluginInstallationScope.OFFICIAL_AND_SPECIFIC_PARTNERS
         )
 
@@ -175,7 +168,7 @@ class TestCheckPluginInstallationScope:
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_none_scope_always_raises(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(scope=PluginInstallationScope.NONE)
+        mock_fs.get_system_features.return_value = _make_features(scope=PluginInstallationScope.NONE)
         verification = MagicMock()
         verification.authorized_category = PluginVerification.AuthorizedCategory.Langgenius
 
@@ -184,19 +177,10 @@ class TestCheckPluginInstallationScope:
 
     @patch("core.plugin.plugin_service.FeatureService")
     def test_all_scope_passes_any(self, mock_fs):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission(scope=PluginInstallationScope.ALL)
+        mock_fs.get_system_features.return_value = _make_features(scope=PluginInstallationScope.ALL)
 
         PluginService._check_plugin_installation_scope(None)  # should not raise
 
-    @patch("core.plugin.plugin_service.FeatureService")
-    def test_unknown_scope_always_raises(self, mock_fs):
-        permission = _make_permission()
-        permission.plugin_installation_scope = cast(PluginInstallationScope, "unknown-scope")
-        mock_fs.get_plugin_installation_permission.return_value = permission
-
-        with pytest.raises(PluginInstallationForbiddenError, match="policy is invalid"):
-            PluginService._check_plugin_installation_scope(None)
-
 
 class TestGetPluginIconUrl:
     @patch("core.plugin.plugin_service.dify_config")
@@ -264,7 +248,7 @@ class TestUpgradePluginWithMarketplace:
     @patch("core.plugin.plugin_service.dify_config")
     def test_skips_download_when_already_installed(self, mock_config, mock_installer_cls, mock_fs, mock_marketplace):
         mock_config.MARKETPLACE_ENABLED = True
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         installer = mock_installer_cls.return_value
         installer.fetch_plugin_manifest.return_value = MagicMock()
         installer.upgrade_plugin.return_value = MagicMock()
@@ -280,7 +264,7 @@ class TestUpgradePluginWithMarketplace:
     @patch("core.plugin.plugin_service.dify_config")
     def test_downloads_when_not_installed(self, mock_config, mock_installer_cls, mock_fs, mock_download):
         mock_config.MARKETPLACE_ENABLED = True
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         installer = mock_installer_cls.return_value
         installer.fetch_plugin_manifest.side_effect = RuntimeError("not found")
         mock_download.return_value = b"pkg-bytes"
@@ -299,7 +283,7 @@ class TestUpgradePluginWithGithub:
     @patch("core.plugin.plugin_service.FeatureService")
     @patch("core.plugin.plugin_service.PluginInstaller")
     def test_checks_marketplace_permission_and_delegates(self, mock_installer_cls: MagicMock, mock_fs: MagicMock):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         installer = mock_installer_cls.return_value
         installer.upgrade_plugin.return_value = MagicMock()
 
@@ -314,7 +298,7 @@ class TestUploadPkg:
     @patch("core.plugin.plugin_service.FeatureService")
     @patch("core.plugin.plugin_service.PluginInstaller")
     def test_runs_permission_and_scope_checks(self, mock_installer_cls: MagicMock, mock_fs: MagicMock):
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         upload_resp = MagicMock()
         upload_resp.verification = None
         mock_installer_cls.return_value.upload_pkg.return_value = upload_resp
@@ -338,7 +322,7 @@ class TestInstallFromMarketplacePkg:
     @patch("core.plugin.plugin_service.dify_config")
     def test_downloads_when_not_cached(self, mock_config, mock_installer_cls, mock_fs, mock_download):
         mock_config.MARKETPLACE_ENABLED = True
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         installer = mock_installer_cls.return_value
         installer.fetch_plugin_manifest.side_effect = RuntimeError("not found")
         mock_download.return_value = b"pkg"
@@ -360,7 +344,7 @@ class TestInstallFromMarketplacePkg:
     @patch("core.plugin.plugin_service.dify_config")
     def test_uses_cached_when_already_downloaded(self, mock_config, mock_installer_cls: MagicMock, mock_fs: MagicMock):
         mock_config.MARKETPLACE_ENABLED = True
-        mock_fs.get_plugin_installation_permission.return_value = _make_permission()
+        mock_fs.get_system_features.return_value = _make_features()
         installer = mock_installer_cls.return_value
         installer.fetch_plugin_manifest.return_value = MagicMock()
         decode_resp = MagicMock()

api/tests/unit_tests/services/test_feature_service_plugin_installation_permission.py

@@ -1,92 +0,0 @@
-import logging
-
-import pytest
-
-from enums.deployment_edition import DeploymentEdition
-from services import feature_service as feature_service_module
-from services.feature_service import FeatureService, PluginInstallationScope, SystemFeatureModel
-
-
-def test_get_plugin_installation_permission_defaults_to_all_for_non_enterprise(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(feature_service_module.dify_config, "ENTERPRISE_ENABLED", False)
-
-    permission = FeatureService.get_plugin_installation_permission()
-
-    assert permission.plugin_installation_scope is PluginInstallationScope.ALL
-    assert permission.restrict_to_marketplace_only is False
-
-
-def test_get_plugin_installation_permission_parses_enterprise_policy(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(feature_service_module.dify_config, "ENTERPRISE_ENABLED", True)
-    monkeypatch.setattr(
-        feature_service_module.EnterpriseService,
-        "get_info",
-        staticmethod(
-            lambda: {
-                "PluginInstallationPermission": {
-                    "pluginInstallationScope": "official_only",
-                    "restrictToMarketplaceOnly": True,
-                }
-            }
-        ),
-    )
-
-    permission = FeatureService.get_plugin_installation_permission()
-
-    assert permission.plugin_installation_scope is PluginInstallationScope.OFFICIAL_ONLY
-    assert permission.restrict_to_marketplace_only is True
-
-
-@pytest.mark.parametrize(
-    "invalid_permission",
-    [
-        {
-            "pluginInstallationScope": "unknown-scope",
-            "restrictToMarketplaceOnly": False,
-        },
-        {
-            "pluginInstallationScope": "all",
-            "restrictToMarketplaceOnly": "false",
-        },
-    ],
-    ids=["unknown_scope", "non_boolean_marketplace_restriction"],
-)
-def test_invalid_enterprise_policy_denies_all_plugin_installations(
-    caplog: pytest.LogCaptureFixture,
-    invalid_permission: dict[str, object],
-) -> None:
-    with caplog.at_level(logging.ERROR, logger="services.feature_service"):
-        permission = FeatureService._resolve_plugin_installation_permission(
-            {"PluginInstallationPermission": invalid_permission}
-        )
-
-    assert permission.plugin_installation_scope is PluginInstallationScope.NONE
-    assert permission.restrict_to_marketplace_only is True
-    assert "denying all plugin installations" in caplog.text
-
-
-def test_system_features_exposes_only_validated_plugin_installation_policy(
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-    monkeypatch.setattr(
-        feature_service_module.EnterpriseService,
-        "get_info",
-        staticmethod(
-            lambda: {
-                "PluginInstallationPermission": {
-                    "pluginInstallationScope": "unknown-scope",
-                    "restrictToMarketplaceOnly": False,
-                }
-            }
-        ),
-    )
-    features = SystemFeatureModel(deployment_edition=DeploymentEdition.ENTERPRISE)
-
-    FeatureService._fulfill_params_from_enterprise(features)
-
-    assert features.plugin_installation_permission.plugin_installation_scope is PluginInstallationScope.NONE
-    assert features.plugin_installation_permission.restrict_to_marketplace_only is True

api/tests/unit_tests/services/test_file_service.py

@@ -1,8 +1,6 @@
 import base64
 import hashlib
 import os
-from collections.abc import Iterator
-from datetime import UTC, datetime
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -11,8 +9,6 @@ from sqlalchemy.orm import Session, sessionmaker
 from werkzeug.exceptions import NotFound
 
 from configs import dify_config
-from extensions.storage.storage_type import StorageType
-from models.base import TypeBase
 from models.enums import CreatorUserRole
 from models.model import Account, EndUser, UploadFile
 from services.errors.file import BlockedFileExtensionError, FileTooLargeError, UnsupportedFileTypeError
@@ -21,54 +17,31 @@ from services.file_service import FileService
 
 class TestFileService:
     @pytest.fixture
-    def sqlite_session_maker(self, sqlite_engine: Engine) -> sessionmaker[Session]:
-        TypeBase.metadata.create_all(sqlite_engine, tables=[TypeBase.metadata.tables[UploadFile.__tablename__]])
-        return sessionmaker(bind=sqlite_engine, expire_on_commit=False)
+    def mock_db_session(self):
+        session = MagicMock(spec=Session)
+        # Mock context manager behavior
+        session.__enter__.return_value = session
+        return session
 
     @pytest.fixture
-    def db_session(self, sqlite_session_maker: sessionmaker[Session]) -> Iterator[Session]:
-        with sqlite_session_maker() as session:
-            yield session
+    def mock_session_maker(self, mock_db_session):
+        maker = MagicMock(spec=sessionmaker)
+        maker.return_value = mock_db_session
+        return maker
 
     @pytest.fixture
-    def file_service(self, sqlite_session_maker: sessionmaker[Session]) -> FileService:
-        return FileService(session_factory=sqlite_session_maker)
+    def file_service(self, mock_session_maker):
+        return FileService(session_factory=mock_session_maker)
 
-    @staticmethod
-    def _persist_upload_file(
-        session: Session,
-        *,
-        file_id: str = "file_id",
-        tenant_id: str = "tenant_id",
-        extension: str = "txt",
-        mime_type: str = "text/plain",
-        key: str = "key",
-    ) -> UploadFile:
-        upload_file = UploadFile(
-            tenant_id=tenant_id,
-            storage_type=StorageType.LOCAL,
-            key=key,
-            name=f"test.{extension}",
-            size=10,
-            extension=extension,
-            mime_type=mime_type,
-            created_by_role=CreatorUserRole.ACCOUNT,
-            created_by="user_id",
-            created_at=datetime(2024, 1, 1, tzinfo=UTC),
-            used=False,
-        )
-        upload_file.id = file_id
-        session.add(upload_file)
-        session.commit()
-        return upload_file
-
-    def test_init_with_engine(self, sqlite_engine: Engine):
-        service = FileService(session_factory=sqlite_engine)
+    def test_init_with_engine(self):
+        engine = MagicMock(spec=Engine)
+        service = FileService(session_factory=engine)
         assert isinstance(service._session_maker, sessionmaker)
 
-    def test_init_with_sessionmaker(self, sqlite_session_maker: sessionmaker[Session]):
-        service = FileService(session_factory=sqlite_session_maker)
-        assert service._session_maker == sqlite_session_maker
+    def test_init_with_sessionmaker(self):
+        maker = MagicMock(spec=sessionmaker)
+        service = FileService(session_factory=maker)
+        assert service._session_maker == maker
 
     def test_init_invalid_factory(self):
         with pytest.raises(AssertionError, match="must be a sessionmaker or an Engine."):
@@ -79,11 +52,11 @@ class TestFileService:
     @patch("services.file_service.extract_tenant_id")
     @patch("services.file_service.file_helpers.get_signed_file_url")
     def test_upload_file_success(
-        self, mock_get_url, mock_tenant_id, mock_now, mock_storage, file_service: FileService, db_session: Session
+        self, mock_get_url, mock_tenant_id, mock_now, mock_storage, file_service: FileService, mock_db_session
     ):
         # Setup
         mock_tenant_id.return_value = "tenant_id"
-        mock_now.return_value = datetime(2024, 1, 1, tzinfo=UTC)
+        mock_now.return_value = "2024-01-01"
         mock_get_url.return_value = "http://signed-url"
 
         user = MagicMock(spec=Account)
@@ -108,9 +81,8 @@ class TestFileService:
         assert result.source_url == "http://signed-url"
 
         mock_storage.save.assert_called_once()
-        persisted = db_session.get(UploadFile, result.id)
-        assert persisted is not None
-        assert persisted.hash == result.hash
+        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)
@@ -137,7 +109,7 @@ class TestFileService:
         with pytest.raises(ValueError, match="Filename contains invalid characters"):
             file_service.upload_file(filename="invalid/file.txt", content=b"", mimetype="text/plain", user=MagicMock())
 
-    def test_upload_file_long_filename(self, file_service: FileService, db_session: Session):
+    def test_upload_file_long_filename(self, file_service: FileService, mock_db_session):
         # Setup
         long_name = "a" * 210 + ".txt"
         user = MagicMock(spec=Account)
@@ -152,7 +124,6 @@ class TestFileService:
             result = file_service.upload_file(filename=long_name, content=b"test", mimetype="text/plain", user=user)
             assert len(result.name) <= 205  # 200 + . + extension
             assert result.name.endswith(".txt")
-            assert db_session.get(UploadFile, result.id) is not None
 
     def test_upload_file_blocked_extension(self, file_service):
         with patch.object(dify_config, "inner_UPLOAD_FILE_EXTENSION_BLACKLIST", "exe"):
@@ -174,7 +145,7 @@ class TestFileService:
             with pytest.raises(FileTooLargeError):
                 file_service.upload_file(filename="test.jpg", content=content, mimetype="image/jpeg", user=MagicMock())
 
-    def test_upload_file_end_user(self, file_service: FileService, db_session: Session):
+    def test_upload_file_end_user(self, file_service: FileService, mock_db_session):
         user = MagicMock(spec=EndUser)
         user.id = "end_user_id"
 
@@ -186,7 +157,6 @@ class TestFileService:
             mock_tenant.return_value = "tenant"
             result = file_service.upload_file(filename="test.txt", content=b"test", mimetype="text/plain", user=user)
             assert result.created_by_role == CreatorUserRole.END_USER
-            assert db_session.get(UploadFile, result.id) is not None
 
     def test_is_file_size_within_limit(self):
         with (
@@ -211,8 +181,12 @@ class TestFileService:
             assert FileService.is_file_size_within_limit(extension="txt", file_size=5 * 1024 * 1024) is True
             assert FileService.is_file_size_within_limit(extension="pdf", file_size=6 * 1024 * 1024) is False
 
-    def test_get_file_base64_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session, key="test_key")
+    def test_get_file_base64_success(self, file_service: FileService, mock_db_session):
+        # Setup
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.key = "test_key"
+        mock_db_session.scalar.return_value = upload_file
 
         with patch("services.file_service.storage") as mock_storage:
             mock_storage.load_once.return_value = b"test content"
@@ -224,17 +198,16 @@ class TestFileService:
             assert result == base64.b64encode(b"test content").decode()
             mock_storage.load_once.assert_called_once_with("test_key")
 
-    def test_get_file_base64_not_found(self, file_service: FileService):
+    def test_get_file_base64_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with pytest.raises(NotFound, match="File not found"):
             file_service.get_file_base64("non_existent")
 
-    def test_get_file_presigned_url_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(
-            db_session,
-            extension="png",
-            mime_type="image/png",
-            key="upload_files/tenant_id/icon.png",
-        )
+    def test_get_file_presigned_url_success(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.key = "upload_files/tenant_id/icon.png"
+        upload_file.mime_type = "image/png"
+        mock_db_session.scalar.return_value = upload_file
 
         with (
             patch.object(dify_config, "FILES_ACCESS_TIMEOUT", 300),
@@ -251,11 +224,13 @@ class TestFileService:
             content_type="image/png",
         )
 
-    def test_get_file_presigned_url_not_found(self, file_service: FileService):
+    def test_get_file_presigned_url_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
+
         with pytest.raises(NotFound, match="File not found"):
             file_service.get_file_presigned_url(file_id="file_id", tenant_id="tenant_id")
 
-    def test_upload_text_success(self, file_service: FileService, db_session: Session):
+    def test_upload_text_success(self, file_service: FileService, mock_db_session):
         # Setup
         text = "sample text"
         text_name = "test.txt"
@@ -274,17 +249,21 @@ class TestFileService:
             assert result.used is True
             assert result.extension == "txt"
             mock_storage.save.assert_called_once()
-            assert db_session.get(UploadFile, result.id) is not None
+            mock_db_session.add.assert_called_once()
+            mock_db_session.commit.assert_called_once()
 
-    def test_upload_text_long_name(self, file_service: FileService, db_session: Session):
+    def test_upload_text_long_name(self, file_service: FileService, mock_db_session):
         long_name = "a" * 210
         with patch("services.file_service.storage"):
             result = file_service.upload_text("text", long_name, "user", "tenant")
             assert len(result.name) == 200
-            assert db_session.get(UploadFile, result.id) is not None
 
-    def test_get_file_preview_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session, extension="pdf", mime_type="application/pdf")
+    def test_get_file_preview_success(self, file_service: FileService, mock_db_session):
+        # Setup
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "pdf"
+        mock_db_session.scalar.return_value = upload_file
 
         with patch("services.file_service.ExtractProcessor.load_from_upload_file") as mock_extract:
             mock_extract.return_value = "Extracted text content"
@@ -295,17 +274,27 @@ class TestFileService:
             # Assert
             assert result == "Extracted text content"
 
-    def test_get_file_preview_not_found(self, file_service: FileService):
+    def test_get_file_preview_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with pytest.raises(NotFound, match="File not found"):
             file_service.get_file_preview("non_existent", "tenant_id")
 
-    def test_get_file_preview_unsupported_type(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session, extension="exe", mime_type="application/octet-stream")
+    def test_get_file_preview_unsupported_type(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "exe"
+        mock_db_session.scalar.return_value = upload_file
         with pytest.raises(UnsupportedFileTypeError):
             file_service.get_file_preview("file_id", "tenant_id")
 
-    def test_get_image_preview_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session, extension="jpg", mime_type="image/jpeg")
+    def test_get_image_preview_success(self, file_service: FileService, mock_db_session):
+        # Setup
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "jpg"
+        upload_file.mime_type = "image/jpeg"
+        upload_file.key = "key"
+        mock_db_session.scalar.return_value = upload_file
 
         with (
             patch("services.file_service.file_helpers.verify_image_signature") as mock_verify,
@@ -327,21 +316,28 @@ class TestFileService:
             with pytest.raises(NotFound, match="File not found or signature is invalid"):
                 file_service.get_image_preview("file_id", "ts", "nonce", "sign")
 
-    def test_get_image_preview_not_found(self, file_service: FileService):
+    def test_get_image_preview_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with patch("services.file_service.file_helpers.verify_image_signature") as mock_verify:
             mock_verify.return_value = True
             with pytest.raises(NotFound, match="File not found or signature is invalid"):
                 file_service.get_image_preview("file_id", "ts", "nonce", "sign")
 
-    def test_get_image_preview_unsupported_type(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session)
+    def test_get_image_preview_unsupported_type(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "txt"
+        mock_db_session.scalar.return_value = upload_file
         with patch("services.file_service.file_helpers.verify_image_signature") as mock_verify:
             mock_verify.return_value = True
             with pytest.raises(UnsupportedFileTypeError):
                 file_service.get_image_preview("file_id", "ts", "nonce", "sign")
 
-    def test_get_file_generator_by_file_id_success(self, file_service: FileService, db_session: Session):
-        upload_file = self._persist_upload_file(db_session)
+    def test_get_file_generator_by_file_id_success(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.key = "key"
+        mock_db_session.scalar.return_value = upload_file
 
         with (
             patch("services.file_service.file_helpers.verify_file_signature") as mock_verify,
@@ -352,8 +348,7 @@ class TestFileService:
 
             gen, file = file_service.get_file_generator_by_file_id("file_id", "ts", "nonce", "sign")
             assert list(gen) == [b"chunk"]
-            assert file.id == upload_file.id
-            assert file.key == upload_file.key
+            assert file == upload_file
 
     def test_get_file_generator_by_file_id_invalid_sig(self, file_service):
         with patch("services.file_service.file_helpers.verify_file_signature") as mock_verify:
@@ -361,14 +356,20 @@ class TestFileService:
             with pytest.raises(NotFound, match="File not found or signature is invalid"):
                 file_service.get_file_generator_by_file_id("file_id", "ts", "nonce", "sign")
 
-    def test_get_file_generator_by_file_id_not_found(self, file_service: FileService):
+    def test_get_file_generator_by_file_id_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with patch("services.file_service.file_helpers.verify_file_signature") as mock_verify:
             mock_verify.return_value = True
             with pytest.raises(NotFound, match="File not found or signature is invalid"):
                 file_service.get_file_generator_by_file_id("file_id", "ts", "nonce", "sign")
 
-    def test_get_public_image_preview_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session, extension="png", mime_type="image/png")
+    def test_get_public_image_preview_success(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "png"
+        upload_file.mime_type = "image/png"
+        upload_file.key = "key"
+        mock_db_session.scalar.return_value = upload_file
 
         with patch("services.file_service.storage") as mock_storage:
             mock_storage.load.return_value = b"image content"
@@ -376,56 +377,66 @@ class TestFileService:
             assert gen == b"image content"
             assert mime == "image/png"
 
-    def test_get_public_image_preview_not_found(self, file_service: FileService):
+    def test_get_public_image_preview_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with pytest.raises(NotFound, match="File not found or signature is invalid"):
             file_service.get_public_image_preview("file_id")
 
-    def test_get_public_image_preview_unsupported_type(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session)
+    def test_get_public_image_preview_unsupported_type(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.extension = "txt"
+        mock_db_session.scalar.return_value = upload_file
         with pytest.raises(UnsupportedFileTypeError):
             file_service.get_public_image_preview("file_id")
 
-    def test_get_file_content_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session)
+    def test_get_file_content_success(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.key = "key"
+        mock_db_session.scalar.return_value = upload_file
 
         with patch("services.file_service.storage") as mock_storage:
             mock_storage.load.return_value = b"hello world"
             result = file_service.get_file_content("file_id")
             assert result == "hello world"
 
-    def test_get_file_content_not_found(self, file_service: FileService):
+    def test_get_file_content_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         with pytest.raises(NotFound, match="File not found"):
             file_service.get_file_content("file_id")
 
-    def test_delete_file_success(self, file_service: FileService, db_session: Session):
-        self._persist_upload_file(db_session)
+    def test_delete_file_success(self, file_service: FileService, mock_db_session):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "file_id"
+        upload_file.key = "key"
+        # For session.scalar(select(...))
+        mock_db_session.scalar.return_value = upload_file
 
         with patch("services.file_service.storage") as mock_storage:
             file_service.delete_file("file_id")
             mock_storage.delete.assert_called_once_with("key")
-            db_session.expire_all()
-            assert db_session.get(UploadFile, "file_id") is None
+            mock_db_session.delete.assert_called_once_with(upload_file)
 
-    def test_delete_file_not_found(self, file_service: FileService):
+    def test_delete_file_not_found(self, file_service: FileService, mock_db_session):
+        mock_db_session.scalar.return_value = None
         file_service.delete_file("file_id")
         # Should return without doing anything
 
-    def test_get_upload_files_by_ids_empty(self, db_session: Session):
-        result = FileService.get_upload_files_by_ids("tenant_id", [], session=db_session)
+    def test_get_upload_files_by_ids_empty(self):
+        session = MagicMock()
+        result = FileService.get_upload_files_by_ids("tenant_id", [], session=session)
         assert result == {}
 
-    def test_get_upload_files_by_ids(self, db_session: Session):
-        upload_file = self._persist_upload_file(db_session, file_id="550e8400-e29b-41d4-a716-446655440000")
-        self._persist_upload_file(
-            db_session,
-            file_id="550e8400-e29b-41d4-a716-446655440001",
-            tenant_id="other-tenant",
-        )
+    def test_get_upload_files_by_ids(self):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.id = "550e8400-e29b-41d4-a716-446655440000"
+        upload_file.tenant_id = "tenant_id"
+        session = MagicMock()
+        session.scalars().all.return_value = [upload_file]
 
         result = FileService.get_upload_files_by_ids(
-            "tenant_id",
-            ["550e8400-e29b-41d4-a716-446655440000", "550e8400-e29b-41d4-a716-446655440001"],
-            session=db_session,
+            "tenant_id", ["550e8400-e29b-41d4-a716-446655440000"], session=session
         )
         assert result["550e8400-e29b-41d4-a716-446655440000"] == upload_file
 
@@ -442,8 +453,10 @@ class TestFileService:
         used.add("a (1).txt")
         assert FileService._dedupe_zip_entry_name("a.txt", used) == "a (2).txt"
 
-    def test_build_upload_files_zip_tempfile(self, db_session: Session):
-        upload_file = self._persist_upload_file(db_session)
+    def test_build_upload_files_zip_tempfile(self):
+        upload_file = MagicMock(spec=UploadFile)
+        upload_file.name = "test.txt"
+        upload_file.key = "key"
 
         with (
             patch("services.file_service.storage") as mock_storage,

api/tests/unit_tests/services/test_human_input_service.py

@@ -1,5 +1,6 @@
 import dataclasses
 import logging
+from collections.abc import Iterator
 from datetime import datetime, timedelta
 from unittest.mock import MagicMock
 
@@ -41,13 +42,14 @@ from services.human_input_service import (
 
 
 @pytest.fixture
-def unbound_session_factory() -> sessionmaker[Session]:
-    """Supply the required constructor dependency without enabling database access."""
-    return sessionmaker()
+def sqlite_session_factory(sqlite_engine: Engine) -> Iterator[tuple[sessionmaker[Session], Session]]:
+    factory = sessionmaker(bind=sqlite_engine, expire_on_commit=False)
+    with factory() as session:
+        yield factory, session
 
 
-def _make_app(mode: AppMode) -> App:
-    return App(
+def _persist_app(sqlite_session: Session, mode: AppMode) -> App:
+    app = App(
         id="app-id",
         tenant_id="tenant-id",
         name="Test App",
@@ -58,6 +60,9 @@ def _make_app(mode: AppMode) -> App:
         enable_api=True,
         max_active_requests=0,
     )
+    sqlite_session.add(app)
+    sqlite_session.commit()
+    return app
 
 
 @pytest.fixture
@@ -92,11 +97,14 @@ def sample_form_record():
     )
 
 
+@pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
 def test_enqueue_resume_dispatches_task_for_workflow(
     mocker: MockerFixture,
-    sqlite_session_factory: sessionmaker[Session],
+    sqlite_session_factory,
+    sqlite_session: Session,
 ):
-    service = HumanInputService(sqlite_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     workflow_run = MagicMock()
     workflow_run.app_id = "app-id"
@@ -108,8 +116,7 @@ def test_enqueue_resume_dispatches_task_for_workflow(
         return_value=workflow_run_repo,
     )
 
-    with sqlite_session_factory.begin() as arrange_session:
-        arrange_session.add(_make_app(AppMode.WORKFLOW))
+    _persist_app(sqlite_session, AppMode.WORKFLOW)
 
     resume_task = mocker.patch("services.human_input_service.resume_app_execution")
 
@@ -121,9 +128,10 @@ def test_enqueue_resume_dispatches_task_for_workflow(
 
 
 def test_ensure_form_active_respects_global_timeout(
-    monkeypatch, sample_form_record: HumanInputFormRecord, unbound_session_factory
+    monkeypatch, sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ):
-    service = HumanInputService(unbound_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
     expired_record = dataclasses.replace(
         sample_form_record,
         created_at=naive_utc_now() - timedelta(hours=2),
@@ -135,11 +143,14 @@ def test_ensure_form_active_respects_global_timeout(
         service.ensure_form_active(Form(expired_record))
 
 
+@pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
 def test_enqueue_resume_dispatches_task_for_advanced_chat(
     mocker: MockerFixture,
-    sqlite_session_factory: sessionmaker[Session],
+    sqlite_session_factory,
+    sqlite_session: Session,
 ):
-    service = HumanInputService(sqlite_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     workflow_run = MagicMock()
     workflow_run.app_id = "app-id"
@@ -151,8 +162,7 @@ def test_enqueue_resume_dispatches_task_for_advanced_chat(
         return_value=workflow_run_repo,
     )
 
-    with sqlite_session_factory.begin() as arrange_session:
-        arrange_session.add(_make_app(AppMode.ADVANCED_CHAT))
+    _persist_app(sqlite_session, AppMode.ADVANCED_CHAT)
 
     resume_task = mocker.patch("services.human_input_service.resume_app_execution")
 
@@ -163,11 +173,14 @@ def test_enqueue_resume_dispatches_task_for_advanced_chat(
     assert call_kwargs["kwargs"]["payload"]["workflow_run_id"] == "workflow-run-id"
 
 
+@pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
 def test_enqueue_resume_skips_unsupported_app_mode(
     mocker: MockerFixture,
-    sqlite_session_factory: sessionmaker[Session],
+    sqlite_session_factory,
+    sqlite_session: Session,
 ):
-    service = HumanInputService(sqlite_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     workflow_run = MagicMock()
     workflow_run.app_id = "app-id"
@@ -179,8 +192,7 @@ def test_enqueue_resume_skips_unsupported_app_mode(
         return_value=workflow_run_repo,
     )
 
-    with sqlite_session_factory.begin() as arrange_session:
-        arrange_session.add(_make_app(AppMode.COMPLETION))
+    _persist_app(sqlite_session, AppMode.COMPLETION)
 
     resume_task = mocker.patch("services.human_input_service.resume_app_execution")
 
@@ -190,13 +202,14 @@ def test_enqueue_resume_skips_unsupported_app_mode(
 
 
 def test_get_form_definition_by_token_for_console_uses_repository(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     console_record = dataclasses.replace(sample_form_record, recipient_type=RecipientType.CONSOLE)
     repo.get_by_token.return_value = console_record
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     form = service.get_form_definition_by_token_for_console("token")
 
     repo.get_by_token.assert_called_once_with("token")
@@ -232,8 +245,9 @@ def _build_resumption_context_state(*, options: list[str], workflow_run_id: str)
 
 
 def test_resolve_form_inputs_uses_runtime_select_options(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ):
+    session_factory, _ = sqlite_session_factory
     configured_input = SelectInputConfig(
         output_variable_name="decision",
         option_source=StringListSource(
@@ -258,7 +272,7 @@ def test_resolve_form_inputs_uses_runtime_select_options(
         "services.human_input_service.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
         return_value=workflow_run_repo,
     )
-    service = HumanInputService(unbound_session_factory)
+    service = HumanInputService(session_factory)
 
     resolved_inputs = service.resolve_form_inputs(Form(record))
 
@@ -270,12 +284,13 @@ def test_resolve_form_inputs_uses_runtime_select_options(
 
 
 def test_submit_form_by_token_calls_repository_and_enqueue(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
     repo.mark_submitted.return_value = sample_form_record
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     enqueue_spy = mocker.patch.object(service, "enqueue_resume")
 
     service.submit_form_by_token(
@@ -298,10 +313,11 @@ def test_submit_form_by_token_calls_repository_and_enqueue(
 
 
 def test_submit_form_by_token_enqueues_agent_app_resume_for_conversation_form(
-    sample_form_record, unbound_session_factory, mocker: MockerFixture
+    sample_form_record, sqlite_session_factory, mocker: MockerFixture
 ):
     # ENG-635: a conversation-owned (Agent v2 chat) form routes to the chat
     # resume, not the workflow resume.
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     conversation_record = dataclasses.replace(
         sample_form_record,
@@ -310,7 +326,7 @@ def test_submit_form_by_token_enqueues_agent_app_resume_for_conversation_form(
     )
     repo.get_by_token.return_value = conversation_record
     repo.mark_submitted.return_value = conversation_record
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     workflow_enqueue_spy = mocker.patch.object(service, "enqueue_resume")
     chat_enqueue_spy = mocker.patch.object(service, "enqueue_agent_app_resume")
 
@@ -327,8 +343,9 @@ def test_submit_form_by_token_enqueues_agent_app_resume_for_conversation_form(
 
 
 def test_submit_form_by_token_skips_enqueue_for_delivery_test(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     test_record = dataclasses.replace(
         sample_form_record,
@@ -337,7 +354,7 @@ def test_submit_form_by_token_skips_enqueue_for_delivery_test(
     )
     repo.get_by_token.return_value = test_record
     repo.mark_submitted.return_value = test_record
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     enqueue_spy = mocker.patch.object(service, "enqueue_resume")
 
     service.submit_form_by_token(
@@ -351,12 +368,13 @@ def test_submit_form_by_token_skips_enqueue_for_delivery_test(
 
 
 def test_submit_form_by_token_passes_submission_user_id(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
     repo.mark_submitted.return_value = sample_form_record
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     enqueue_spy = mocker.patch.object(service, "enqueue_resume")
 
     service.submit_form_by_token(
@@ -373,10 +391,11 @@ def test_submit_form_by_token_passes_submission_user_id(
     enqueue_spy.assert_called_once_with(sample_form_record.workflow_run_id)
 
 
-def test_submit_form_by_token_invalid_action(sample_form_record: HumanInputFormRecord, unbound_session_factory):
+def test_submit_form_by_token_invalid_action(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     with pytest.raises(InvalidFormDataError) as exc_info:
         service.submit_form_by_token(
@@ -390,7 +409,8 @@ def test_submit_form_by_token_invalid_action(sample_form_record: HumanInputFormR
     repo.mark_submitted.assert_not_called()
 
 
-def test_submit_form_by_token_missing_inputs(sample_form_record: HumanInputFormRecord, unbound_session_factory):
+def test_submit_form_by_token_missing_inputs(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
 
     definition_with_input = FormDefinition(
@@ -402,7 +422,7 @@ def test_submit_form_by_token_missing_inputs(sample_form_record: HumanInputFormR
     )
     form_with_input = dataclasses.replace(sample_form_record, definition=definition_with_input)
     repo.get_by_token.return_value = form_with_input
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     with pytest.raises(InvalidFormDataError) as exc_info:
         service.submit_form_by_token(
@@ -416,6 +436,42 @@ def test_submit_form_by_token_missing_inputs(sample_form_record: HumanInputFormR
     repo.mark_submitted.assert_not_called()
 
 
+def test_validate_human_input_submission_accepts_select_file_and_file_list(sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
+    definition = FormDefinition.model_validate(
+        {
+            "form_content": "Pick one and upload files",
+            "inputs": [
+                {
+                    "type": "select",
+                    "output_variable_name": "decision",
+                    "option_source": {
+                        "type": "constant",
+                        "value": ["approve", "reject"],
+                    },
+                },
+                {
+                    "type": "file",
+                    "output_variable_name": "attachment",
+                    "allowed_file_types": ["document"],
+                    "allowed_file_upload_methods": ["remote_url"],
+                },
+                {
+                    "type": "file-list",
+                    "output_variable_name": "attachments",
+                    "allowed_file_types": ["document"],
+                    "allowed_file_upload_methods": ["remote_url"],
+                    "number_limits": 3,
+                },
+            ],
+            "user_actions": [{"id": "submit", "title": "Submit"}],
+            "rendered_content": "<p>Pick one and upload files</p>",
+            "expiration_time": naive_utc_now() + timedelta(hours=1),
+        }
+    )
+
+
 @pytest.mark.parametrize(
     ("input_definition", "submitted_value", "expected_message"),
     [
@@ -466,11 +522,12 @@ def test_submit_form_by_token_missing_inputs(sample_form_record: HumanInputFormR
 )
 def test_validate_human_input_submission_rejects_invalid_select_and_file_payloads(
     sample_form_record,
-    unbound_session_factory,
+    sqlite_session_factory,
     input_definition,
     submitted_value,
     expected_message,
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition.model_validate(
         {
@@ -482,7 +539,7 @@ def test_validate_human_input_submission_rejects_invalid_select_and_file_payload
         }
     )
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record, definition=definition)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     with pytest.raises(InvalidFormDataError) as exc_info:
         service.submit_form_by_token(
@@ -512,7 +569,7 @@ def test_form_properties(sample_form_record: HumanInputFormRecord):
 
 def test_form_submitted_error_init():
     error = FormSubmittedError(form_id="test-form")
-    assert error.description == "This form has already been submitted by another user, form_id=test-form"
+    assert "form_id=test-form" in error.description
     assert error.code == 412
 
 
@@ -523,55 +580,61 @@ def test_human_input_service_init_with_engine(sqlite_engine: Engine):
     assert service._session_factory.kw["bind"] is sqlite_engine
 
 
-def test_get_form_by_token_none(unbound_session_factory):
+def test_get_form_by_token_none(sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = None
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     assert service.get_form_by_token("invalid") is None
 
 
-def test_get_form_definition_by_token_mismatch(sample_form_record: HumanInputFormRecord, unbound_session_factory):
+def test_get_form_definition_by_token_mismatch(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     # RecipientType mismatch
     assert service.get_form_definition_by_token(RecipientType.CONSOLE, "token") is None
 
 
-def test_get_form_definition_by_token_success(sample_form_record: HumanInputFormRecord, unbound_session_factory):
+def test_get_form_definition_by_token_success(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     form = service.get_form_definition_by_token(RecipientType.STANDALONE_WEB_APP, "token")
     assert form is not None
     assert form.id == sample_form_record.form_id
 
 
 def test_get_form_definition_by_token_for_console_mismatch(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record  # is STANDALONE_WEB_APP
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     assert service.get_form_definition_by_token_for_console("token") is None
 
 
-def test_submit_form_by_token_delivery_not_enabled(unbound_session_factory):
+def test_submit_form_by_token_delivery_not_enabled(sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = None
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     with pytest.raises(human_input_service_module.WebAppDeliveryNotEnabledError):
         service.submit_form_by_token(RecipientType.STANDALONE_WEB_APP, "token", "action", {})
 
 
 def test_submit_form_by_token_no_workflow_run_id(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ):
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
 
@@ -579,15 +642,16 @@ def test_submit_form_by_token_no_workflow_run_id(
     result_record = dataclasses.replace(sample_form_record, workflow_run_id=None)
     repo.mark_submitted.return_value = result_record
 
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     enqueue_spy = mocker.patch.object(service, "enqueue_resume")
 
     service.submit_form_by_token(RecipientType.STANDALONE_WEB_APP, "token", "submit", {})
     enqueue_spy.assert_not_called()
 
 
-def test_ensure_form_active_errors(sample_form_record: HumanInputFormRecord, unbound_session_factory):
-    service = HumanInputService(unbound_session_factory)
+def test_ensure_form_active_errors(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     # Submitted
     submitted_record = dataclasses.replace(sample_form_record, submitted_at=naive_utc_now())
@@ -607,16 +671,18 @@ def test_ensure_form_active_errors(sample_form_record: HumanInputFormRecord, unb
         service.ensure_form_active(Form(expired_time_record))
 
 
-def test_ensure_not_submitted_raises(sample_form_record: HumanInputFormRecord, unbound_session_factory):
-    service = HumanInputService(unbound_session_factory)
+def test_ensure_not_submitted_raises(sample_form_record: HumanInputFormRecord, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
     submitted_record = dataclasses.replace(sample_form_record, submitted_at=naive_utc_now())
 
     with pytest.raises(human_input_service_module.FormSubmittedError):
         service._ensure_not_submitted(Form(submitted_record))
 
 
-def test_enqueue_resume_workflow_not_found(mocker: MockerFixture, unbound_session_factory):
-    service = HumanInputService(unbound_session_factory)
+def test_enqueue_resume_workflow_not_found(mocker: MockerFixture, sqlite_session_factory):
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     workflow_run_repo = MagicMock()
     workflow_run_repo.get_workflow_run_by_id_without_tenant.return_value = None
@@ -630,12 +696,15 @@ def test_enqueue_resume_workflow_not_found(mocker: MockerFixture, unbound_sessio
     assert "WorkflowRun not found" in str(excinfo.value)
 
 
+@pytest.mark.parametrize("sqlite_session", [(App,)], indirect=True)
 def test_enqueue_resume_app_not_found(
     mocker,
-    sqlite_session_factory: sessionmaker[Session],
+    sqlite_session_factory,
+    sqlite_session: Session,
     caplog: pytest.LogCaptureFixture,
 ):
-    service = HumanInputService(sqlite_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     workflow_run = MagicMock()
     workflow_run.app_id = "app-id"
@@ -646,31 +715,26 @@ def test_enqueue_resume_app_not_found(
         "services.human_input_service.DifyAPIRepositoryFactory.create_api_workflow_run_repository",
         return_value=workflow_run_repo,
     )
-    resume_task = mocker.patch("services.human_input_service.resume_app_execution")
 
     with caplog.at_level(logging.ERROR, logger="services.human_input_service"):
         service.enqueue_resume("workflow-run-id")
-
-    assert (
-        "services.human_input_service",
-        logging.ERROR,
-        "App not found for WorkflowRun, workflow_run_id=workflow-run-id, app_id=app-id",
-    ) in caplog.record_tuples
-    resume_task.apply_async.assert_not_called()
+        assert any(r.levelno >= logging.ERROR for r in caplog.records)
 
 
 def test_is_globally_expired_zero_timeout(
-    monkeypatch: pytest.MonkeyPatch, sample_form_record: HumanInputFormRecord, unbound_session_factory
+    monkeypatch: pytest.MonkeyPatch, sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ):
-    service = HumanInputService(unbound_session_factory)
+    session_factory, _ = sqlite_session_factory
+    service = HumanInputService(session_factory)
 
     monkeypatch.setattr(human_input_service_module.dify_config, "HUMAN_INPUT_GLOBAL_TIMEOUT_SECONDS", 0)
     assert service._is_globally_expired(Form(sample_form_record)) is False
 
 
 def test_submit_form_by_token_normalizes_select_and_files(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ) -> None:
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition(
         form_content="hello",
@@ -689,7 +753,7 @@ def test_submit_form_by_token_normalizes_select_and_files(
     form_with_inputs = dataclasses.replace(sample_form_record, definition=definition)
     repo.get_by_token.return_value = form_with_inputs
     repo.mark_submitted.return_value = form_with_inputs
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     single_file = File(
         file_id="file-1",
@@ -751,8 +815,9 @@ def test_submit_form_by_token_normalizes_select_and_files(
 
 
 def test_submit_form_by_token_invalid_select_value(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ) -> None:
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition(
         form_content="hello",
@@ -767,7 +832,7 @@ def test_submit_form_by_token_invalid_select_value(
         expiration_time=sample_form_record.expiration_time,
     )
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record, definition=definition)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     with pytest.raises(InvalidFormDataError, match="Invalid value for select input 'decision'"):
         service.submit_form_by_token(
@@ -779,8 +844,9 @@ def test_submit_form_by_token_invalid_select_value(
 
 
 def test_submit_form_by_token_invalid_file_list_item(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory
 ) -> None:
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition(
         form_content="hello",
@@ -790,7 +856,7 @@ def test_submit_form_by_token_invalid_file_list_item(
         expiration_time=sample_form_record.expiration_time,
     )
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record, definition=definition)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
 
     with pytest.raises(
         InvalidFormDataError,
@@ -805,8 +871,9 @@ def test_submit_form_by_token_invalid_file_list_item(
 
 
 def test_submit_form_by_token_rejects_cross_tenant_file(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ) -> None:
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition(
         form_content="hello",
@@ -816,7 +883,7 @@ def test_submit_form_by_token_rejects_cross_tenant_file(
         expiration_time=sample_form_record.expiration_time,
     )
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record, definition=definition)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     mocker.patch("services.human_input_service.build_from_mapping", side_effect=ValueError("Invalid upload file"))
 
     with pytest.raises(InvalidFormDataError, match="Invalid value for file input 'attachment'"):
@@ -837,8 +904,9 @@ def test_submit_form_by_token_rejects_cross_tenant_file(
 
 
 def test_submit_form_by_token_rejects_cross_tenant_file_list(
-    sample_form_record: HumanInputFormRecord, unbound_session_factory, mocker: MockerFixture
+    sample_form_record: HumanInputFormRecord, sqlite_session_factory, mocker: MockerFixture
 ) -> None:
+    session_factory, _ = sqlite_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     definition = FormDefinition(
         form_content="hello",
@@ -848,7 +916,7 @@ def test_submit_form_by_token_rejects_cross_tenant_file_list(
         expiration_time=sample_form_record.expiration_time,
     )
     repo.get_by_token.return_value = dataclasses.replace(sample_form_record, definition=definition)
-    service = HumanInputService(unbound_session_factory, form_repository=repo)
+    service = HumanInputService(session_factory, form_repository=repo)
     mocker.patch("services.human_input_service.build_from_mappings", side_effect=ValueError("Invalid upload file"))
 
     with pytest.raises(

api/tests/unit_tests/services/test_workflow_run_service_pause.py

@@ -1,57 +1,178 @@
-"""Tests for the session lifecycle owned by ``WorkflowRunService``."""
+"""Comprehensive unit tests for WorkflowRunService class.
 
-from unittest.mock import create_autospec, patch
+This test suite covers all pause state management operations including:
+- Retrieving pause state for workflow runs
+- Saving pause state with file uploads
+- Marking paused workflows as resumed
+- Error handling and edge cases
+- Database transaction management
+- Repository-based approach testing
+"""
+
+from datetime import datetime
+from unittest.mock import MagicMock, create_autospec, patch
 
 import pytest
-from sqlalchemy import Engine, text
+from sqlalchemy import Engine
 from sqlalchemy.orm import Session, sessionmaker
 
+from graphon.enums import WorkflowExecutionStatus
+from models.workflow import WorkflowPause
 from repositories.api_workflow_run_repository import APIWorkflowRunRepository
-from services.workflow_run_service import WorkflowRunService
+from repositories.sqlalchemy_api_workflow_run_repository import _PrivateWorkflowPauseEntity
+from services.workflow_run_service import (
+    WorkflowRunService,
+)
 
 
-@pytest.fixture
-def sqlite_session_factory(sqlite_engine: Engine) -> sessionmaker[Session]:
-    """Return a real factory whose sessions are bound to the isolated SQLite engine."""
-    return sessionmaker(bind=sqlite_engine, expire_on_commit=False)
+class TestDataFactory:
+    """Factory class for creating test data objects."""
+
+    @staticmethod
+    def create_workflow_run_mock(
+        id: str = "workflow-run-123",
+        tenant_id: str = "tenant-456",
+        app_id: str = "app-789",
+        workflow_id: str = "workflow-101",
+        status: str | WorkflowExecutionStatus = "paused",
+        **kwargs,
+    ) -> MagicMock:
+        """Create a mock WorkflowRun object."""
+        mock_run = MagicMock()
+        mock_run.id = id
+        mock_run.tenant_id = tenant_id
+        mock_run.app_id = app_id
+        mock_run.workflow_id = workflow_id
+        mock_run.status = status
+
+        for key, value in kwargs.items():
+            setattr(mock_run, key, value)
+
+        return mock_run
+
+    @staticmethod
+    def create_workflow_pause_mock(
+        id: str = "pause-123",
+        tenant_id: str = "tenant-456",
+        app_id: str = "app-789",
+        workflow_id: str = "workflow-101",
+        workflow_execution_id: str = "workflow-execution-123",
+        state_file_id: str = "file-456",
+        resumed_at: datetime | None = None,
+        **kwargs,
+    ) -> MagicMock:
+        """Create a mock WorkflowPauseModel object."""
+        mock_pause = MagicMock(spec=WorkflowPause)
+        mock_pause.id = id
+        mock_pause.tenant_id = tenant_id
+        mock_pause.app_id = app_id
+        mock_pause.workflow_id = workflow_id
+        mock_pause.workflow_execution_id = workflow_execution_id
+        mock_pause.state_file_id = state_file_id
+        mock_pause.resumed_at = resumed_at
+
+        for key, value in kwargs.items():
+            setattr(mock_pause, key, value)
+
+        return mock_pause
+
+    @staticmethod
+    def create_pause_entity_mock(
+        pause_model: MagicMock | None = None,
+    ) -> _PrivateWorkflowPauseEntity:
+        """Create a mock _PrivateWorkflowPauseEntity object."""
+        if pause_model is None:
+            pause_model = TestDataFactory.create_workflow_pause_mock()
+
+        return _PrivateWorkflowPauseEntity(pause_model=pause_model, reason_models=[], human_input_form=[])
 
 
-@pytest.fixture
-def workflow_run_repository():
-    """Keep the repository boundary mocked while exercising real session construction."""
-    return create_autospec(APIWorkflowRunRepository)
+class TestWorkflowRunService:
+    """Comprehensive unit tests for WorkflowRunService class."""
 
+    @pytest.fixture
+    def mock_session_factory(self):
+        """Create a mock session factory with proper session management."""
+        mock_session = create_autospec(Session)
 
-def test_init_with_session_factory(
-    sqlite_session_factory: sessionmaker[Session], workflow_run_repository: APIWorkflowRunRepository
-) -> None:
-    with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as repository_factory:
-        repository_factory.create_api_workflow_run_repository.return_value = workflow_run_repository
+        # Create a mock context manager for the session
+        mock_session_cm = MagicMock()
+        mock_session_cm.__enter__ = MagicMock(return_value=mock_session)
+        mock_session_cm.__exit__ = MagicMock(return_value=None)
 
-        service = WorkflowRunService(sqlite_session_factory)
+        # Create a mock context manager for the transaction
+        mock_transaction_cm = MagicMock()
+        mock_transaction_cm.__enter__ = MagicMock(return_value=mock_session)
+        mock_transaction_cm.__exit__ = MagicMock(return_value=None)
 
-    assert service._session_factory is sqlite_session_factory
-    repository_factory.create_api_workflow_run_repository.assert_called_once_with(sqlite_session_factory)
-    with service._session_factory() as session:
-        assert session.scalar(text("SELECT 1")) == 1
+        mock_session.begin = MagicMock(return_value=mock_transaction_cm)
 
+        # Create mock factory that returns the context manager
+        mock_factory = MagicMock(spec=sessionmaker)
+        mock_factory.return_value = mock_session_cm
 
-def test_init_with_engine_creates_bound_session_factory(
-    sqlite_engine: Engine, workflow_run_repository: APIWorkflowRunRepository
-) -> None:
-    with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as repository_factory:
-        repository_factory.create_api_workflow_run_repository.return_value = workflow_run_repository
+        return mock_factory, mock_session
 
-        service = WorkflowRunService(sqlite_engine)
+    @pytest.fixture
+    def mock_workflow_run_repository(self):
+        """Create a mock APIWorkflowRunRepository."""
+        mock_repo = create_autospec(APIWorkflowRunRepository)
+        return mock_repo
 
-    assert service._session_factory.kw["bind"] is sqlite_engine
-    assert service._session_factory.kw["expire_on_commit"] is False
-    repository_factory.create_api_workflow_run_repository.assert_called_once_with(service._session_factory)
-    with service._session_factory() as session:
-        assert session.scalar(text("SELECT 1")) == 1
+    @pytest.fixture
+    def workflow_run_service(self, mock_session_factory, mock_workflow_run_repository):
+        """Create WorkflowRunService instance with mocked dependencies."""
+        session_factory, _ = mock_session_factory
 
+        with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as mock_factory:
+            mock_factory.create_api_workflow_run_repository.return_value = mock_workflow_run_repository
+            service = WorkflowRunService(session_factory)
+            return service
 
-def test_init_with_default_repository_dependencies(sqlite_session_factory: sessionmaker[Session]) -> None:
-    service = WorkflowRunService(sqlite_session_factory)
+    @pytest.fixture
+    def workflow_run_service_with_engine(self, mock_session_factory, mock_workflow_run_repository):
+        """Create WorkflowRunService instance with Engine input."""
+        mock_engine = create_autospec(Engine)
+        session_factory, _ = mock_session_factory
 
-    assert service._session_factory is sqlite_session_factory
+        with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as mock_factory:
+            mock_factory.create_api_workflow_run_repository.return_value = mock_workflow_run_repository
+            service = WorkflowRunService(mock_engine)
+            return service
+
+    # ==================== Initialization Tests ====================
+
+    def test_init_with_session_factory(self, mock_session_factory, mock_workflow_run_repository):
+        """Test WorkflowRunService initialization with session_factory."""
+        session_factory, _ = mock_session_factory
+
+        with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as mock_factory:
+            mock_factory.create_api_workflow_run_repository.return_value = mock_workflow_run_repository
+            service = WorkflowRunService(session_factory)
+
+            assert service._session_factory == session_factory
+            mock_factory.create_api_workflow_run_repository.assert_called_once_with(session_factory)
+
+    def test_init_with_engine(self, mock_session_factory, mock_workflow_run_repository):
+        """Test WorkflowRunService initialization with Engine (should convert to sessionmaker)."""
+        mock_engine = create_autospec(Engine)
+        session_factory, _ = mock_session_factory
+
+        with patch("services.workflow_run_service.DifyAPIRepositoryFactory", autospec=True) as mock_factory:
+            mock_factory.create_api_workflow_run_repository.return_value = mock_workflow_run_repository
+            with patch(
+                "services.workflow_run_service.sessionmaker", return_value=session_factory, autospec=True
+            ) as mock_sessionmaker:
+                service = WorkflowRunService(mock_engine)
+
+                mock_sessionmaker.assert_called_once_with(bind=mock_engine, expire_on_commit=False)
+                assert service._session_factory == session_factory
+                mock_factory.create_api_workflow_run_repository.assert_called_once_with(session_factory)
+
+    def test_init_with_default_dependencies(self, mock_session_factory):
+        """Test WorkflowRunService initialization with default dependencies."""
+        session_factory, _ = mock_session_factory
+
+        service = WorkflowRunService(session_factory)
+
+        assert service._session_factory == session_factory

api/tests/unit_tests/services/test_workflow_service.py

@@ -50,9 +50,6 @@ from services.workflow_service import (
     _setup_variable_pool,
 )
 
-_LEGACY_FILE_TEMPLATE = "{{#" + ".".join(("sys", "files")) + "#}}"
-_USER_INPUT_FILE_TEMPLATE = "{{#" + ".".join(("userinput", "files")) + "#}}"
-
 
 class TestWorkflowAssociatedDataFactory:
     """
@@ -280,31 +277,6 @@ class TestWorkflowService:
 
         assert result is workflow
 
-    def test_get_draft_workflow_persists_legacy_system_files_migration(
-        self, workflow_service: WorkflowService, sqlite_session: Session
-    ):
-        # TODO: Remove this compatibility test after the historical workflow migration is complete.
-        app = TestWorkflowAssociatedDataFactory.create_app()
-        workflow = TestWorkflowAssociatedDataFactory.create_workflow(
-            graph={
-                "nodes": [
-                    {"id": "start", "data": {"type": "start", "variables": []}},
-                    {"id": "answer", "data": {"type": "answer", "answer": _LEGACY_FILE_TEMPLATE}},
-                ],
-                "edges": [],
-            }
-        )
-        sqlite_session.add(workflow)
-        sqlite_session.commit()
-
-        result = workflow_service.get_draft_workflow(app, session=sqlite_session)
-
-        assert result is workflow
-        assert _LEGACY_FILE_TEMPLATE not in workflow.graph
-        assert _USER_INPUT_FILE_TEMPLATE in workflow.graph
-        sqlite_session.expire_all()
-        assert _USER_INPUT_FILE_TEMPLATE in sqlite_session.get(Workflow, workflow.id).graph
-
     def test_get_draft_workflow_returns_none(self, workflow_service: WorkflowService, sqlite_session: Session):
         """Test get_draft_workflow returns None when no draft exists."""
         app = TestWorkflowAssociatedDataFactory.create_app()

api/tests/unit_tests/services/workflow/test_workflow_converter_additional.py

@@ -239,29 +239,6 @@ def test__convert_to_llm_node_for_chatbot_simple_chat_model(default_variables: l
     assert "{{#start.text_input#}}" in node["data"]["prompt_template"][0]["text"]
 
 
-def test__convert_to_llm_node_uses_userinput_files_for_vision(default_variables: list[VariableEntity]) -> None:
-    workflow_converter = WorkflowConverter()
-    graph = {"nodes": [workflow_converter._convert_to_start_node(default_variables)], "edges": []}
-    model_config = ModelConfigEntity(provider="openai", model="gpt-4", mode=LLMMode.CHAT.value, parameters={}, stop=[])
-    prompt_template = PromptTemplateEntity(
-        prompt_type=PromptTemplateEntity.PromptType.SIMPLE,
-        simple_prompt_template="Describe the upload",
-    )
-    file_upload = MagicMock()
-    file_upload.image_config = None
-
-    node = workflow_converter._convert_to_llm_node(
-        original_app_mode=AppMode.CHAT,
-        new_app_mode=AppMode.ADVANCED_CHAT,
-        model_config=model_config,
-        graph=graph,
-        prompt_template=prompt_template,
-        file_upload=file_upload,
-    )
-
-    assert node["data"]["vision"]["variable_selector"] == ["userinput", "files"]
-
-
 def test__convert_to_llm_node_for_chatbot_simple_chat_model_with_empty_template(
     default_variables: list[VariableEntity],
     monkeypatch: pytest.MonkeyPatch,

api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py

@@ -34,9 +34,6 @@ from services.workflow_draft_variable_service import (
     _model_to_insertion_dict,
 )
 
-# TODO: Remove this compatibility key after the historical workflow migration is complete.
-_SYSTEM_FILE_OUTPUT_KEY = ".".join((SYSTEM_VARIABLE_NODE_ID, "files"))
-
 SQLITE_MODELS = (Workflow, WorkflowDraftVariable, WorkflowDraftVariableFile, WorkflowNodeExecutionModel)
 pytestmark = [
     pytest.mark.usefixtures("sqlite_session"),
@@ -130,7 +127,7 @@ class TestDraftVariableSaver:
             assert node_id == c.expected_node_id, fail_msg
             assert name == c.expected_name, fail_msg
 
-    def test_build_variables_from_start_mapping_rebuilds_system_file_variable(self, sqlite_session: Session):
+    def test_build_variables_from_start_mapping_rebuilds_system_files(self, sqlite_session: Session):
         mock_user = MagicMock(spec=Account)
         mock_user.id = str(uuid.uuid4())
         saver = DraftVariableSaver(
@@ -162,7 +159,7 @@ class TestDraftVariableSaver:
             "services.workflow_draft_variable_service.build_file_from_stored_mapping",
             return_value=rebuilt_file,
         ) as rebuild_file:
-            draft_vars = saver._build_variables_from_start_mapping({_SYSTEM_FILE_OUTPUT_KEY: [raw_file]})
+            draft_vars = saver._build_variables_from_start_mapping({"sys.files": [raw_file]})
 
         sys_var = draft_vars[0]
         assert sys_var.get_value().value[0] == rebuilt_file
@@ -270,7 +267,7 @@ class TestDraftVariableSaver:
     def test_start_node_save_persists_sys_timestamp_and_workflow_run_id(
         self, mock_batch_upsert, sqlite_session: Session
     ):
-        """Start node should persist common system variables."""
+        """Start node should persist common `sys.*` variables, not only `sys.files`."""
         mock_user = MagicMock(spec=Account)
         mock_user.id = "test-user-id"
         mock_user.tenant_id = "test-tenant-id"
@@ -554,7 +551,7 @@ class TestWorkflowDraftVariableService:
 
         # Create mock execution record
         mock_execution = Mock(spec=WorkflowNodeExecutionModel)
-        mock_execution.load_full_outputs.return_value = {_SYSTEM_FILE_OUTPUT_KEY: "[]"}
+        mock_execution.load_full_outputs.return_value = {"sys.files": "[]"}
 
         # Mock the repository to return the execution record
         service._api_node_execution_repo = Mock()

api/tests/unit_tests/tools/test_mcp_tool.py

@@ -135,19 +135,6 @@ class TestMCPToolInvoke:
         values = {m.message.variable_name: m.message.variable_value for m in var_msgs}
         assert values == {"a": 1, "b": "x"}
 
-    def test_invoke_yields_json_when_structured_content_has_no_output_schema(self, orm_session: Session) -> None:
-        tool = _make_mcp_tool()
-        result = CallToolResult(content=[], structuredContent={"a": 1, "b": "x"})
-
-        with patch.object(tool, "invoke_remote_mcp_tool", return_value=result):
-            messages = list(tool._invoke(session=orm_session, user_id="test_user", tool_parameters={}))
-
-        assert len(messages) == 1
-        msg = messages[0]
-        assert msg.type == ToolInvokeMessage.MessageType.JSON
-        assert isinstance(msg.message, ToolInvokeMessage.JsonMessage)
-        assert msg.message.json_object == {"a": 1, "b": "x"}
-
 
 class TestMCPToolUsageExtraction:
     """Test usage metadata extraction from MCP tool results."""

api/uv.lock

@@ -1281,7 +1281,7 @@ wheels = [
 
 [[package]]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 source = { editable = "../dify-agent" }
 dependencies = [
     { name = "httpx" },
@@ -1331,7 +1331,7 @@ docs = [
 
 [[package]]
 name = "dify-api"
-version = "1.16.1"
+version = "1.16.0"
 source = { virtual = "." }
 dependencies = [
     { name = "aliyun-log-python-sdk" },

cli/package.json

@@ -71,7 +71,7 @@
     "channel": "alpha",
     "compat": {
       "minDify": "1.16.0",
-      "maxDify": "1.16.1"
+      "maxDify": "1.16.0"
     },
     "release": {
       "tagPrefix": "difyctl-v",

cli/scripts/install-cli.test.ts

@@ -1,402 +0,0 @@
-import { execFileSync, spawnSync } from 'node:child_process'
-import { chmodSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const SCRIPT = fileURLToPath(new URL('./install-cli.sh', import.meta.url))
-
-function pickAsset(target: string, releaseJson: string): string {
-  return execFileSync('sh', ['-c', `. "${SCRIPT}"; pick_asset "$1"`, 'sh', target], {
-    input: releaseJson,
-    encoding: 'utf8',
-    env: { ...process.env, DIFYCTL_INSTALL_LIB: '1' },
-  }).trim()
-}
-
-function assetVersion(name: string, target: string): string {
-  return execFileSync('sh', ['-c', `. "${SCRIPT}"; asset_version "$1" "$2"`, 'sh', name, target], {
-    encoding: 'utf8',
-    env: { ...process.env, DIFYCTL_INSTALL_LIB: '1' },
-  }).trim()
-}
-
-// Stubs the only network primitive (fetch_json) so resolution logic runs fully
-// offline. Routes by URL; release bodies come from env (TAG_<tag-with-._->_>),
-// the latest release from LATEST_JSON, the listing from LIST_JSON. A missing
-// fixture returns 22 to mimic `curl -f` on a 4xx.
-/* oxlint-disable no-template-curly-in-string -- shell parameter expansions, not JS template literals */
-const FETCH_STUB = [
-  'fetch_json() {',
-  '  case "$1" in',
-  '    *"/releases/latest") [ -n "${LATEST_JSON:-}" ] || return 22; printf "%s" "$LATEST_JSON" ;;',
-  '    *"/releases?per_page=100") [ -n "${LIST_JSON:-}" ] || return 22; printf "%s" "$LIST_JSON" ;;',
-  '    *"/releases/tags/"*)',
-  '      _t=${1##*/releases/tags/};',
-  '      _k=$(printf "TAG_%s" "$_t" | tr ".-" "__");',
-  '      eval "_v=\\${$_k:-}";',
-  '      [ -n "$_v" ] || return 22;',
-  '      printf "%s" "$_v" ;;',
-  '    *) return 22 ;;',
-  '  esac',
-  '}',
-].join('\n')
-/* oxlint-enable no-template-curly-in-string */
-
-function runLib(
-  program: string,
-  env: Record<string, string> = {},
-): { code: number; stdout: string; stderr: string } {
-  const full = `. "${SCRIPT}"\n${FETCH_STUB}\n${program}`
-  const r = spawnSync('sh', ['-c', full], {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      DIFYCTL_INSTALL_LIB: '1',
-      DIFY_VERSION: '',
-      DIFYCTL_VERSION: '',
-      ...env,
-    },
-  })
-  return { code: r.status ?? 1, stdout: (r.stdout ?? '').trim(), stderr: r.stderr ?? '' }
-}
-
-// Like runLib but with a caller-supplied fetch_json stub, so we can drive the
-// real rate_limit_hint / maybe_ratelimit_exit / fetch_hit_ratelimit (which the
-// script defines) by writing a classified reason to FETCH_ERR_FILE.
-function runLibStub(
-  stub: string,
-  program: string,
-  env: Record<string, string> = {},
-): { code: number; stderr: string } {
-  const full = `. "${SCRIPT}"\n${stub}\n${program}`
-  const r = spawnSync('sh', ['-c', full], {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      DIFYCTL_INSTALL_LIB: '1',
-      DIFY_VERSION: '',
-      DIFYCTL_VERSION: '',
-      ...env,
-    },
-  })
-  return { code: r.status ?? 1, stderr: r.stderr ?? '' }
-}
-
-// A fetch_json that always fails with the given classification, mimicking the
-// real one writing to FETCH_ERR_FILE from inside a command-substitution subshell.
-function failStub(reason: string): string {
-  return `fetch_json() { printf '%s' '${reason}' > "$FETCH_ERR_FILE"; return 1; }`
-}
-
-const REL_1142 = JSON.stringify({
-  tag_name: '1.14.2',
-  assets: [{ name: 'difyctl-v0.2.0-linux-x64' }, { name: 'difyctl-v0.2.0-checksums.txt' }],
-})
-const REL_1150 = JSON.stringify({
-  tag_name: '1.15.0',
-  assets: [{ name: 'difyctl-v0.3.0-linux-x64' }],
-})
-const LIST_NEWEST_FIRST = JSON.stringify({
-  releases: [{ tag_name: '1.15.0' }, { tag_name: '1.14.2' }],
-})
-
-const RELEASE = JSON.stringify({
-  tag_name: '1.14.2',
-  name: 'Dify 1.14.2',
-  assets: [
-    { name: 'difyctl-v0.1.0-rc.1-linux-x64' },
-    { name: 'difyctl-v0.2.0-linux-x64' },
-    { name: 'difyctl-v0.2.0-linux-arm64' },
-    { name: 'difyctl-v0.2.0-darwin-arm64' },
-    { name: 'difyctl-v0.2.0-windows-x64.exe' },
-    { name: 'difyctl-v0.2.0-checksums.txt' },
-    { name: 'some-other-asset.zip' },
-  ],
-})
-
-describe('install-cli pick_asset', () => {
-  it('picks the highest difyctl version for a linux target', () => {
-    expect(pickAsset('linux-x64', RELEASE)).toBe('difyctl-v0.2.0-linux-x64')
-  })
-
-  it('matches the windows .exe asset', () => {
-    expect(pickAsset('windows-x64', RELEASE)).toBe('difyctl-v0.2.0-windows-x64.exe')
-  })
-
-  it('matches an arm64 target exactly (no x64 bleed-through)', () => {
-    expect(pickAsset('darwin-arm64', RELEASE)).toBe('difyctl-v0.2.0-darwin-arm64')
-  })
-
-  it('excludes the checksums asset', () => {
-    expect(pickAsset('linux-x64', RELEASE)).not.toContain('checksums')
-  })
-
-  it('yields empty when no asset matches the target', () => {
-    expect(pickAsset('darwin-x64', RELEASE)).toBe('')
-  })
-
-  it('picks the highest semver when several difyctl versions are present', () => {
-    const many = JSON.stringify({
-      assets: [
-        { name: 'difyctl-v0.2.0-linux-x64' },
-        { name: 'difyctl-v0.10.0-linux-x64' },
-        { name: 'difyctl-v0.9.0-linux-x64' },
-      ],
-    })
-    expect(pickAsset('linux-x64', many)).toBe('difyctl-v0.10.0-linux-x64')
-  })
-})
-
-describe('install-cli asset_version', () => {
-  it('extracts the version from a posix asset name', () => {
-    expect(assetVersion('difyctl-v0.2.0-linux-x64', 'linux-x64')).toBe('0.2.0')
-  })
-
-  it('extracts the version from a windows .exe asset name', () => {
-    expect(assetVersion('difyctl-v0.2.0-windows-x64.exe', 'windows-x64')).toBe('0.2.0')
-  })
-
-  it('extracts a prerelease version', () => {
-    expect(assetVersion('difyctl-v0.1.0-rc.1-linux-x64', 'linux-x64')).toBe('0.1.0-rc.1')
-  })
-})
-
-describe('install-cli resolve_release', () => {
-  it('DIFY_VERSION pins the release directly', () => {
-    const r = runLib('resolve_release linux-x64; printf "%s" "$DIFY_TAG"', {
-      DIFY_VERSION: '1.14.2',
-      TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('DIFY_VERSION that does not exist dies with a clear message', () => {
-    const r = runLib('resolve_release linux-x64', { DIFY_VERSION: '9.9.9' })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('Dify release 9.9.9 not found')
-  })
-
-  it('blank resolves to the latest stable release', () => {
-    const r = runLib('resolve_release linux-x64; printf "%s" "$DIFY_TAG"', {
-      LATEST_JSON: REL_1150,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.15.0')
-  })
-
-  it('blank dies when the latest query fails (no silent fallback)', () => {
-    const r = runLib('resolve_release linux-x64')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('failed to query latest Dify release')
-  })
-
-  it('DIFYCTL_VERSION resolves to the release hosting that build', () => {
-    const r = runLib('resolve_release linux-x64; printf "%s" "$DIFY_TAG"', {
-      DIFYCTL_VERSION: '0.2.0',
-      LIST_JSON: LIST_NEWEST_FIRST,
-      TAG_1_15_0: REL_1150,
-      TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('DIFYCTL_VERSION not hosted anywhere dies', () => {
-    const r = runLib('resolve_release linux-x64', {
-      DIFYCTL_VERSION: '9.9.9',
-      LIST_JSON: LIST_NEWEST_FIRST,
-      TAG_1_15_0: REL_1150,
-      TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('difyctl 9.9.9 not found on any Dify release')
-  })
-})
-
-describe('install-cli find_release_for_difyctl', () => {
-  it('returns the newest release whose assets host the wanted build', () => {
-    const r = runLib('find_release_for_difyctl 0.2.0 linux-x64', {
-      LIST_JSON: LIST_NEWEST_FIRST,
-      TAG_1_15_0: REL_1150,
-      TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('dies (not false-negative) when the releases listing fails', () => {
-    const r = runLib('find_release_for_difyctl 0.2.0 linux-x64')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('failed to query')
-  })
-
-  it('warns and skips a release whose fetch fails, then finds it later', () => {
-    const r = runLib('find_release_for_difyctl 0.2.0 linux-x64', {
-      LIST_JSON: LIST_NEWEST_FIRST,
-      TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-    expect(r.stderr).toContain('fetch failed for 1.15.0')
-  })
-})
-
-describe('install-cli rate limit', () => {
-  const futureReset = String(Math.floor(Date.now() / 1000) + 1800)
-
-  it('latest: reports the rate limit with reset ETA and remediation, not a generic error', () => {
-    const r = runLibStub(failStub(`ratelimit:${futureReset}`), 'resolve_release linux-x64')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).toContain('resets in ~')
-    expect(r.stderr).toContain('GITHUB_TOKEN')
-    expect(r.stderr).not.toContain('failed to query latest')
-  })
-
-  it('DIFY_VERSION: rate limit wins over the misleading "not found" message', () => {
-    const r = runLibStub(failStub(`ratelimit:${futureReset}`), 'resolve_release linux-x64', {
-      DIFY_VERSION: '1.15.0',
-    })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).not.toContain('not found')
-  })
-
-  it('DIFYCTL_VERSION: rate limit surfaces from the nested subshell, not "not found"', () => {
-    const r = runLibStub(failStub(`ratelimit:${futureReset}`), 'resolve_release linux-x64', {
-      DIFYCTL_VERSION: '0.2.0',
-    })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).not.toContain('not found')
-  })
-
-  it('omits the ETA line when the reset epoch is missing', () => {
-    const r = runLibStub(failStub('ratelimit:'), 'resolve_release linux-x64')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).not.toContain('resets in ~')
-  })
-
-  it('a non-rate-limit HTTP error falls back to the generic message (no false hint)', () => {
-    const r = runLibStub(failStub('http:500'), 'resolve_release linux-x64')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('failed to query latest')
-    expect(r.stderr).not.toContain('rate limit exceeded')
-  })
-})
-
-// A stand-in for curl that honours the flags fetch_json passes (-D/-o/-w/-H) and
-// fabricates a response per FAKE_MODE, so the tests exercise the REAL fetch_json
-// (its curl invocation, header parsing, classification and token handling) rather
-// than a stub. Header names it emits are lowercase, as HTTP/2 delivers them.
-const FAKE_CURL = `#!/bin/sh
-hdr=""; body=""
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -D) hdr="$2"; shift 2 ;;
-    -o) body="$2"; shift 2 ;;
-    -H) printf '%s\\n' "$2" >> "\${FAKE_HDR_LOG:-/dev/null}"; shift 2 ;;
-    -w) shift 2 ;;
-    *) shift ;;
-  esac
-done
-case "\${FAKE_MODE:-ok}" in
-  ok)
-    [ -n "$hdr" ] && printf 'HTTP/2 200\\r\\n\\r\\n' > "$hdr"
-    [ -n "$body" ] && printf '%s' "\${FAKE_BODY:-}" > "$body"
-    printf '200' ;;
-  ratelimit)
-    [ -n "$hdr" ] && printf 'HTTP/2 403\\r\\nx-ratelimit-remaining: 0\\r\\nx-ratelimit-reset: %s\\r\\n\\r\\n' "\${FAKE_RESET:-9999999999}" > "$hdr"
-    printf '403' ;;
-  perm403)
-    [ -n "$hdr" ] && printf 'HTTP/2 403\\r\\nx-ratelimit-remaining: 59\\r\\n\\r\\n' > "$hdr"
-    printf '403' ;;
-  notfound)
-    [ -n "$hdr" ] && printf 'HTTP/2 404\\r\\n\\r\\n' > "$hdr"
-    printf '404' ;;
-  net) exit 6 ;;
-esac
-`
-
-// Drive the real fetch_json with FAKE_CURL first on PATH. Returns "OK|<body>" or
-// "FAIL|<FETCH_ERR_FILE contents>", plus any -H lines the fake curl received.
-function runRealFetch(
-  mode: string,
-  env: Record<string, string> = {},
-): { result: string; headers: string } {
-  const dir = mkdtempSync(join(tmpdir(), 'difyctl-fakecurl-'))
-  const hdrLog = join(dir, 'hdrlog')
-  writeFileSync(join(dir, 'curl'), FAKE_CURL)
-  chmodSync(join(dir, 'curl'), 0o755)
-  const program =
-    'if body=$(fetch_json "https://api.github.com/repos/x/releases/latest"); then printf \'OK|%s\' "$body"; else printf \'FAIL|%s\' "$(cat "$FETCH_ERR_FILE" 2>/dev/null)"; fi'
-  const r = spawnSync('sh', ['-c', `. "${SCRIPT}"\n${program}`], {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      PATH: `${dir}:${process.env.PATH ?? ''}`,
-      DIFYCTL_INSTALL_LIB: '1',
-      DIFY_VERSION: '',
-      DIFYCTL_VERSION: '',
-      FAKE_MODE: mode,
-      FAKE_HDR_LOG: hdrLog,
-      ...env,
-    },
-  })
-  let headers = ''
-  try {
-    headers = readFileSync(hdrLog, 'utf8')
-  } catch {
-    /* no headers logged */
-  }
-  rmSync(dir, { recursive: true, force: true })
-  return { result: (r.stdout ?? '').trim(), headers }
-}
-
-describe('install-cli fetch_json (real, fake curl on PATH)', () => {
-  it('returns the response body on 200', () => {
-    expect(runRealFetch('ok', { FAKE_BODY: '{"tag_name":"1.15.0"}' }).result).toBe(
-      'OK|{"tag_name":"1.15.0"}',
-    )
-  })
-
-  it('classifies a 403 with x-ratelimit-remaining:0 as a rate limit and captures the reset', () => {
-    expect(runRealFetch('ratelimit', { FAKE_RESET: '1893456000' }).result).toBe(
-      'FAIL|ratelimit:1893456000',
-    )
-  })
-
-  it('classifies a 403 with tokens left as a plain http error, not a rate limit', () => {
-    expect(runRealFetch('perm403').result).toBe('FAIL|http:403')
-  })
-
-  it('classifies a 404 as an http error', () => {
-    expect(runRealFetch('notfound').result).toBe('FAIL|http:404')
-  })
-
-  it('classifies a curl transport failure as a network error', () => {
-    expect(runRealFetch('net').result).toBe('FAIL|network')
-  })
-
-  it('sends an Authorization bearer header when GITHUB_TOKEN is set', () => {
-    expect(runRealFetch('ok', { FAKE_BODY: '{}', GITHUB_TOKEN: 'ghp_secret' }).headers).toContain(
-      'Authorization: Bearer ghp_secret',
-    )
-  })
-
-  it('falls back to GH_TOKEN when GITHUB_TOKEN is unset', () => {
-    expect(
-      runRealFetch('ok', { FAKE_BODY: '{}', GITHUB_TOKEN: '', GH_TOKEN: 'gho_fallback' }).headers,
-    ).toContain('Authorization: Bearer gho_fallback')
-  })
-
-  it('sends no Authorization header when neither token is set', () => {
-    expect(
-      runRealFetch('ok', { FAKE_BODY: '{}', GITHUB_TOKEN: '', GH_TOKEN: '' }).headers,
-    ).not.toContain('Authorization')
-  })
-})

cli/scripts/install-r2.ps1.test.ts

@@ -1,53 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const SCRIPT = fileURLToPath(new URL('./install-r2.ps1', import.meta.url))
-const hasPwsh = spawnSync('pwsh', ['-v'], { encoding: 'utf8' }).status === 0
-const d = hasPwsh ? describe : describe.skip
-
-const MANIFEST = JSON.stringify({
-  schema: 1,
-  name: 'difyctl',
-  channel: 'edge',
-  version: '0.1.0-edge.2fd7b82',
-  baseUrl: 'https://pub.example.r2.dev/difyctl/edge/0.1.0-edge.2fd7b82',
-  targets: {
-    'windows-x64': { asset: 'difyctl-v0.1.0-edge.2fd7b82-windows-x64.exe', sha256: 'deadbeef' },
-  },
-})
-
-function pwsh(program: string): { code: number; stdout: string; stderr: string } {
-  const full = `. '${SCRIPT}'\n${program}`
-  const r = spawnSync('pwsh', ['-NoProfile', '-Command', full], {
-    encoding: 'utf8',
-    env: { ...process.env, DIFYCTL_INSTALL_LIB: '1' },
-  })
-  return {
-    code: r.status ?? 1,
-    stdout: (r.stdout ?? '').replace(/\r\n/g, '\n').trim(),
-    stderr: r.stderr ?? '',
-  }
-}
-
-d('install-r2.ps1', () => {
-  it('parses a target asset + sha from the manifest', () => {
-    const prog =
-      `$m = ConvertFrom-Json @'\n${MANIFEST}\n'@\n` +
-      `Write-Output (Get-TargetField $m 'windows-x64' 'asset')\n` +
-      `Write-Output (Get-TargetField $m 'windows-x64' 'sha256')`
-    const { stdout } = pwsh(prog)
-    expect(stdout).toBe('difyctl-v0.1.0-edge.2fd7b82-windows-x64.exe\ndeadbeef')
-  })
-
-  it('errors when DIFYCTL_R2_BASE is unset', () => {
-    const r = spawnSync('pwsh', ['-NoProfile', '-File', SCRIPT], {
-      encoding: 'utf8',
-      env: { ...process.env, DIFYCTL_R2_BASE: '' },
-    })
-    if (hasPwsh) {
-      expect(r.status).not.toBe(0)
-      expect(r.stderr + r.stdout).toMatch(/DIFYCTL_R2_BASE/)
-    }
-  })
-})

cli/scripts/install-r2.test.ts

@@ -1,149 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const SCRIPT = fileURLToPath(new URL('./install-r2.sh', import.meta.url))
-
-const MANIFEST = [
-  '{',
-  '  "schema": 1,',
-  '  "name": "difyctl",',
-  '  "channel": "edge",',
-  '  "version": "0.1.0-edge.2fd7b82",',
-  '  "commit": "abc1234",',
-  '  "buildDate": "2026-06-14T12:00:00Z",',
-  '  "compat": {"minDify":"1.14.0","maxDify":"1.15.0"},',
-  '  "baseUrl": "https://pub.example.r2.dev/difyctl/edge/0.1.0-edge.2fd7b82",',
-  '  "targets": {',
-  '    "linux-x64": { "asset": "difyctl-v0.1.0-edge.2fd7b82-linux-x64", "sha256": "deadbeef" },',
-  '    "darwin-arm64": { "asset": "difyctl-v0.1.0-edge.2fd7b82-darwin-arm64", "sha256": "cafef00d" }',
-  '  }',
-  '}',
-].join('\n')
-
-const INDEX = [
-  '{',
-  '  "schema": 1,',
-  '  "channel": "edge",',
-  '  "updated": "2026-06-15T00:00:00Z",',
-  '  "builds": [',
-  '    {',
-  '      "version": "0.1.0-edge.ce4af868",',
-  '      "commit": "ce4af868d653f405070fabb3be3303430cc030ad",',
-  '      "buildDate": "2026-06-15T00:00:00Z",',
-  '      "dir": "0.1.0-edge.ce4af868"',
-  '    },',
-  '    {',
-  '      "version": "0.1.0-edge.aaaa111",',
-  '      "commit": "aaaa111bbbbcccc000011112222333344445555",',
-  '      "buildDate": "2026-06-14T00:00:00Z",',
-  '      "dir": "0.1.0-edge.aaaa111"',
-  '    }',
-  '  ]',
-  '}',
-].join('\n')
-
-const CHECKSUMS = [
-  'deadbeef  difyctl-v0.1.0-edge.ce4af868-linux-x64',
-  'cafef00d  difyctl-v0.1.0-edge.ce4af868-darwin-arm64',
-  'beadc0de  difyctl-v0.1.0-edge.ce4af868-windows-x64.exe',
-].join('\n')
-
-function lib(
-  program: string,
-  env: Record<string, string> = {},
-): { code: number; stdout: string; stderr: string } {
-  const full = `. "${SCRIPT}"\n${program}`
-  const r = spawnSync('sh', ['-c', full], {
-    encoding: 'utf8',
-    env: { ...process.env, DIFYCTL_INSTALL_LIB: '1', ...env },
-  })
-  return { code: r.status ?? 1, stdout: (r.stdout ?? '').trim(), stderr: r.stderr ?? '' }
-}
-
-describe('install-r2 manifest parsing', () => {
-  // install-r2.sh is POSIX-only; under git-bash on Windows `uname -s` is MINGW*,
-  // so detect_target intentionally dies (Windows installs go through install-r2.ps1).
-  it.skipIf(process.platform === 'win32')('detect_target maps to one of the 5 ids', () => {
-    const { stdout } = lib('detect_target')
-    expect(['linux-x64', 'linux-arm64', 'darwin-x64', 'darwin-arm64', 'windows-x64']).toContain(
-      stdout,
-    )
-  })
-
-  it('manifest_str reads a top-level string field', () => {
-    const { stdout } = lib(
-      `printf '%s' '${MANIFEST}' > "$tmp_m"; manifest_str "$tmp_m" channel`,
-      {},
-    )
-    expect(stdout).toBe('edge')
-  })
-
-  it('manifest_target_field extracts per-target values from a single line', () => {
-    const prog =
-      `printf '%s' '${MANIFEST}' > "$tmp_m"\n` +
-      'manifest_target_field "$tmp_m" darwin-arm64 asset\n' +
-      'manifest_target_field "$tmp_m" darwin-arm64 sha256'
-    const { stdout } = lib(prog)
-    expect(stdout).toBe('difyctl-v0.1.0-edge.2fd7b82-darwin-arm64\ncafef00d')
-  })
-
-  it('requires DIFYCTL_R2_BASE when run as the installer (not lib)', () => {
-    const r = spawnSync('sh', [SCRIPT], {
-      encoding: 'utf8',
-      env: { ...process.env, DIFYCTL_R2_BASE: '' },
-    })
-    expect(r.status).not.toBe(0)
-    expect(r.stderr).toMatch(/DIFYCTL_R2_BASE/)
-  })
-
-  it('sha256_check aborts on a checksum mismatch', () => {
-    const r = lib('f="$(mktemp)"; printf \'hello\' > "$f"; sha256_check "$f" deadbeef')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toMatch(/checksum mismatch/)
-  })
-
-  it('sha256_check passes on the correct hash', () => {
-    // sha256('hello') = 2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824
-    const r = lib(
-      'f="$(mktemp)"; printf \'hello\' > "$f"; sha256_check "$f" 2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824 && echo OK',
-    )
-    expect(r.stdout).toBe('OK')
-  })
-})
-
-describe('install-r2 version/commit pin', () => {
-  it('index_resolve matches a build by exact version', () => {
-    const r = lib(
-      `printf '%s' '${INDEX}' > "$tmp_m"; index_resolve "$tmp_m" version 0.1.0-edge.aaaa111`,
-    )
-    expect(r.stdout).toBe('0.1.0-edge.aaaa111\t0.1.0-edge.aaaa111')
-  })
-
-  it('index_resolve matches a build by commit prefix', () => {
-    const r = lib(`printf '%s' '${INDEX}' > "$tmp_m"; index_resolve "$tmp_m" commit ce4af868`)
-    expect(r.stdout).toBe('0.1.0-edge.ce4af868\t0.1.0-edge.ce4af868')
-  })
-
-  it('index_resolve matches the full 40-char commit too', () => {
-    const r = lib(
-      `printf '%s' '${INDEX}' > "$tmp_m"; index_resolve "$tmp_m" commit aaaa111bbbbcccc000011112222333344445555`,
-    )
-    expect(r.stdout).toBe('0.1.0-edge.aaaa111\t0.1.0-edge.aaaa111')
-  })
-
-  it('index_resolve prints nothing when no build matches', () => {
-    const r = lib(`printf '%s' '${INDEX}' > "$tmp_m"; index_resolve "$tmp_m" commit ffffff`)
-    expect(r.stdout).toBe('')
-  })
-
-  it('checksums_target extracts sha and asset for a posix target', () => {
-    const r = lib(`printf '%s' '${CHECKSUMS}' > "$tmp_m"; checksums_target "$tmp_m" darwin-arm64`)
-    expect(r.stdout).toBe('cafef00d\tdifyctl-v0.1.0-edge.ce4af868-darwin-arm64')
-  })
-
-  it('checksums_target does not bleed x64 into arm64', () => {
-    const r = lib(`printf '%s' '${CHECKSUMS}' > "$tmp_m"; checksums_target "$tmp_m" linux-x64`)
-    expect(r.stdout).toBe('deadbeef\tdifyctl-v0.1.0-edge.ce4af868-linux-x64')
-  })
-})

cli/scripts/install.ps1.test.ts

@@ -1,297 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const SCRIPT = fileURLToPath(new URL('./install.ps1', import.meta.url))
-
-function hasPwsh(): boolean {
-  const r = spawnSync(
-    'pwsh',
-    ['-NoProfile', '-NonInteractive', '-Command', '$PSVersionTable.PSVersion.Major'],
-    {
-      encoding: 'utf8',
-    },
-  )
-  return r.status === 0
-}
-
-const PWSH = hasPwsh()
-
-const STUB = [
-  'function Invoke-RestMethod {',
-  '    param([string]$Uri, $Headers)',
-  "    if ($Uri -like '*/releases/latest') {",
-  "        if (-not $env:HX_LATEST) { throw 'mock 404' }",
-  '        return ($env:HX_LATEST | ConvertFrom-Json)',
-  '    }',
-  "    elseif ($Uri -like '*/releases?per_page=100') {",
-  "        if (-not $env:HX_LIST) { throw 'mock 404' }",
-  '        return ($env:HX_LIST | ConvertFrom-Json)',
-  '    }',
-  "    elseif ($Uri -like '*/releases/tags/*') {",
-  "        $t = $Uri -replace '.*/releases/tags/', ''",
-  "        $k = 'HX_TAG_' + ($t -replace '[.\\-]', '_')",
-  '        $v = [Environment]::GetEnvironmentVariable($k)',
-  "        if (-not $v) { throw 'mock 404' }",
-  '        return ($v | ConvertFrom-Json)',
-  '    }',
-  '    throw "unexpected uri $Uri"',
-  '}',
-].join('\n')
-
-type Run = { code: number; stdout: string; stderr: string }
-
-function runPwsh(body: string, env: Record<string, string> = {}): Run {
-  const script = `$ErrorActionPreference='Stop'\n${STUB}\n. '${SCRIPT}'\n${body}`
-  const r = spawnSync('pwsh', ['-NoProfile', '-NonInteractive', '-Command', script], {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      DIFYCTL_INSTALL_LIB: '1',
-      DIFY_VERSION: '',
-      DIFYCTL_VERSION: '',
-      LOCALAPPDATA: process.env.LOCALAPPDATA || '/tmp',
-      TEMP: process.env.TEMP || '/tmp',
-      ...env,
-    },
-  })
-  return { code: r.status ?? 1, stdout: (r.stdout ?? '').trim(), stderr: r.stderr ?? '' }
-}
-
-const REL_1142 = JSON.stringify({
-  tag_name: '1.14.2',
-  assets: [{ name: 'difyctl-v0.2.0-windows-x64.exe' }],
-})
-const REL_1150 = JSON.stringify({
-  tag_name: '1.15.0',
-  assets: [{ name: 'difyctl-v0.3.0-windows-x64.exe' }],
-})
-const LIST_NEWEST_FIRST = JSON.stringify([
-  { tag_name: '1.15.0', assets: [{ name: 'difyctl-v0.3.0-windows-x64.exe' }] },
-  { tag_name: '1.14.2', assets: [{ name: 'difyctl-v0.2.0-windows-x64.exe' }] },
-])
-
-describe.skipIf(!PWSH)('install.ps1 Get-AssetSemver', () => {
-  it('extracts the version from a windows .exe asset name', () => {
-    const r = runPwsh("(Get-AssetSemver 'difyctl-v0.2.0-windows-x64.exe').Version")
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('0.2.0')
-  })
-
-  it('extracts a prerelease version and its rc number', () => {
-    const r = runPwsh(
-      '$a = Get-AssetSemver \'difyctl-v0.1.0-rc.1-windows-x64.exe\'; "$($a.Version) $($a.Rc)"',
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('0.1.0-rc.1 1')
-  })
-
-  it('rejects a non-windows asset (returns null)', () => {
-    const r = runPwsh(
-      "if ($null -eq (Get-AssetSemver 'difyctl-v0.2.0-linux-x64')) { 'NULL' } else { 'OBJ' }",
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-
-  it('rejects a malformed core version (returns null)', () => {
-    const r = runPwsh(
-      "if ($null -eq (Get-AssetSemver 'difyctl-vx.y.z-windows-x64.exe')) { 'NULL' } else { 'OBJ' }",
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-})
-
-describe.skipIf(!PWSH)('install.ps1 Select-Asset', () => {
-  it('picks the highest semver among several windows builds', () => {
-    const rel = JSON.stringify({
-      assets: [
-        { name: 'difyctl-v0.2.0-windows-x64.exe' },
-        { name: 'difyctl-v0.10.0-windows-x64.exe' },
-        { name: 'difyctl-v0.9.0-windows-x64.exe' },
-      ],
-    })
-    const r = runPwsh(`(Select-Asset ('${rel}' | ConvertFrom-Json)).Version`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('0.10.0')
-  })
-
-  it('prefers the stable release over an rc of the same core', () => {
-    const rel = JSON.stringify({
-      assets: [
-        { name: 'difyctl-v0.2.0-rc.1-windows-x64.exe' },
-        { name: 'difyctl-v0.2.0-windows-x64.exe' },
-      ],
-    })
-    const r = runPwsh(`(Select-Asset ('${rel}' | ConvertFrom-Json)).Version`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('0.2.0')
-  })
-
-  it('ignores checksums and non-windows assets', () => {
-    const rel = JSON.stringify({
-      assets: [
-        { name: 'difyctl-v0.2.0-linux-x64' },
-        { name: 'difyctl-v0.2.0-checksums.txt' },
-        { name: 'difyctl-v0.2.0-windows-x64.exe' },
-        { name: 'some-other-asset.zip' },
-      ],
-    })
-    const r = runPwsh(`(Select-Asset ('${rel}' | ConvertFrom-Json)).Name`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('difyctl-v0.2.0-windows-x64.exe')
-  })
-
-  it('yields null when no windows asset is present', () => {
-    const rel = JSON.stringify({ assets: [{ name: 'difyctl-v0.2.0-linux-x64' }] })
-    const r = runPwsh(
-      `if ($null -eq (Select-Asset ('${rel}' | ConvertFrom-Json))) { 'NULL' } else { 'OBJ' }`,
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-})
-
-describe.skipIf(!PWSH)('install.ps1 Resolve-Release', () => {
-  it('DIFY_VERSION pins the release directly', () => {
-    const r = runPwsh('(Resolve-Release).tag_name', {
-      DIFY_VERSION: '1.14.2',
-      HX_TAG_1_14_2: REL_1142,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('DIFY_VERSION that does not exist throws a clear message', () => {
-    const r = runPwsh('(Resolve-Release).tag_name', { DIFY_VERSION: '9.9.9' })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('Dify release 9.9.9 not found')
-  })
-
-  it('blank resolves to the latest release', () => {
-    const r = runPwsh('(Resolve-Release).tag_name', { HX_LATEST: REL_1150 })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.15.0')
-  })
-
-  it('blank throws when the latest query fails (no silent fallback)', () => {
-    const r = runPwsh('(Resolve-Release).tag_name')
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('failed to query latest Dify release')
-  })
-
-  it('DIFYCTL_VERSION resolves to the release hosting that build', () => {
-    const r = runPwsh('(Resolve-Release).tag_name', {
-      DIFYCTL_VERSION: '0.2.0',
-      HX_LIST: LIST_NEWEST_FIRST,
-    })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('DIFYCTL_VERSION not hosted anywhere throws', () => {
-    const r = runPwsh('(Resolve-Release).tag_name', {
-      DIFYCTL_VERSION: '9.9.9',
-      HX_LIST: LIST_NEWEST_FIRST,
-    })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('difyctl 9.9.9 not found on any Dify release')
-  })
-})
-
-describe.skipIf(!PWSH)('install.ps1 Find-ReleaseForDifyctl', () => {
-  it('returns the newest release whose assets host the wanted build', () => {
-    const r = runPwsh("(Find-ReleaseForDifyctl '0.2.0').tag_name", { HX_LIST: LIST_NEWEST_FIRST })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('1.14.2')
-  })
-
-  it('returns nothing when no release hosts the wanted build', () => {
-    const r = runPwsh(
-      "$x = Find-ReleaseForDifyctl '9.9.9'; if ($null -eq $x) { 'NULL' } else { $x.tag_name }",
-      { HX_LIST: LIST_NEWEST_FIRST },
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-})
-
-// Build a fake ErrorRecord whose Exception.Response is a real HttpResponseMessage
-// carrying the given status + headers, matching what Get-RateLimitInfo inspects.
-function fakeErr(status: number, headers: Record<string, string>): string {
-  const adds = Object.entries(headers)
-    .map(([k, v]) => `$resp.Headers.TryAddWithoutValidation('${k}','${v}') | Out-Null`)
-    .join('\n')
-  return [
-    `$resp = [System.Net.Http.HttpResponseMessage]::new([System.Net.HttpStatusCode]${status})`,
-    adds,
-    '$err = [pscustomobject]@{ Exception = [pscustomobject]@{ Response = $resp } }',
-  ].join('\n')
-}
-
-const futureReset = String(Math.floor(Date.now() / 1000) + 1800)
-
-describe.skipIf(!PWSH)('install.ps1 rate limit', () => {
-  it('classifies a 403 with x-ratelimit-remaining:0 as rate-limited, returning the reset', () => {
-    const r =
-      runPwsh(`${fakeErr(403, { 'x-ratelimit-remaining': '0', 'x-ratelimit-reset': futureReset })}
-      $i = Get-RateLimitInfo $err; if ($null -eq $i) { 'NULL' } else { $i.Reset }`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe(futureReset)
-  })
-
-  it('does not classify a 403 with remaining tokens as rate-limited', () => {
-    const r = runPwsh(`${fakeErr(403, { 'x-ratelimit-remaining': '59' })}
-      $i = Get-RateLimitInfo $err; if ($null -eq $i) { 'NULL' } else { 'LIMITED' }`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-
-  it('always treats a 429 as rate-limited', () => {
-    const r = runPwsh(`${fakeErr(429, {})}
-      $i = Get-RateLimitInfo $err; if ($null -eq $i) { 'NULL' } else { 'LIMITED' }`)
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('LIMITED')
-  })
-
-  it('returns null for an error without a response (e.g. a plain string throw)', () => {
-    const r = runPwsh(
-      "$err = [pscustomobject]@{ Exception = [pscustomobject]@{} }; if ($null -eq (Get-RateLimitInfo $err)) { 'NULL' } else { 'OBJ' }",
-    )
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('NULL')
-  })
-
-  it('Write-RateLimitHint prints cause, ETA, and remediation to stderr', () => {
-    const r = runPwsh(`Write-RateLimitHint '${futureReset}'`)
-    expect(r.code).toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).toContain('resets in ~')
-    expect(r.stderr).toContain('GITHUB_TOKEN')
-  })
-
-  it('Write-RateLimitHint omits the ETA line when the reset epoch is missing', () => {
-    const r = runPwsh("Write-RateLimitHint ''")
-    expect(r.code).toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).not.toContain('resets in ~')
-  })
-
-  it('sends an Authorization header when GITHUB_TOKEN is set', () => {
-    const r = runPwsh('$headers.Authorization', { GITHUB_TOKEN: 'ghp_secret123' })
-    expect(r.code).toBe(0)
-    expect(r.stdout).toBe('Bearer ghp_secret123')
-  })
-
-  it('Resolve-Release surfaces the rate-limit hint and exits, not "not found"', () => {
-    const stub = `function Invoke-RestMethod { throw [Microsoft.PowerShell.Commands.HttpResponseException]::new('rate limited', $script:rlResp) }`
-    const setup = `$script:rlResp = [System.Net.Http.HttpResponseMessage]::new([System.Net.HttpStatusCode]403)
-      $script:rlResp.Headers.TryAddWithoutValidation('x-ratelimit-remaining','0') | Out-Null
-      $script:rlResp.Headers.TryAddWithoutValidation('x-ratelimit-reset','${futureReset}') | Out-Null`
-    const r = runPwsh(`${setup}\n${stub}\nResolve-Release`, { DIFY_VERSION: '1.15.0' })
-    expect(r.code).not.toBe(0)
-    expect(r.stderr).toContain('rate limit exceeded')
-    expect(r.stderr).not.toContain('not found')
-  })
-})

cli/scripts/lib/edge-manifest.mjs

@@ -0,0 +1,78 @@
+import { assetNameFor } from './release-rules.mjs'
+
+// checksums lines are "<sha256>  <assetName>"
+export function parseChecksums(text) {
+  const map = new Map()
+  for (const line of text.split('\n')) {
+    const m = line.match(/^([0-9a-f]{64})\s+(\S+)$/i)
+    if (m) map.set(m[2], m[1])
+  }
+  return map
+}
+
+// Newline-delimited dir names of binaries that still exist in R2.
+export function parseDirList(text) {
+  const set = new Set()
+  for (const line of text.split('\n')) {
+    const d = line.trim()
+    if (d) set.add(d)
+  }
+  return set
+}
+
+export function resolveTargets(release, version, shas) {
+  const targets = []
+  const missing = []
+  for (const t of release.targets) {
+    const asset = assetNameFor(release, version, t.id)
+    const sha = shas.get(asset)
+    if (sha) targets.push({ id: t.id, asset, sha })
+    else missing.push(asset)
+  }
+  return { targets, missing }
+}
+
+export function renderManifest({
+  binName,
+  channel,
+  version,
+  commit,
+  buildDate,
+  compat,
+  baseUrl,
+  targets,
+}) {
+  const head = {
+    schema: 1,
+    name: binName,
+    channel,
+    version,
+    commit,
+    buildDate,
+    compat: { minDify: compat.minDify, maxDify: compat.maxDify },
+    baseUrl,
+  }
+  const headLines = Object.entries(head)
+    .map(([k, v]) => `  ${JSON.stringify(k)}: ${JSON.stringify(v)}`)
+    .join(',\n')
+  const targetLines = targets
+    .map(
+      (t) =>
+        `    ${JSON.stringify(t.id)}: { "asset": ${JSON.stringify(t.asset)}, "sha256": ${JSON.stringify(t.sha)} }`,
+    )
+    .join(',\n')
+  return `{\n${headLines},\n  "targets": {\n${targetLines}\n  }\n}\n`
+}
+
+// `current` is the parsed ledger or null (first publish). `existingDirs` is a
+// Set of build dirs still present in R2, or null when the caller could not list
+// them — lifecycle/TTL on the bin prefix is the only deletion mechanism, so the
+// ledger must never advertise a build whose binary is gone. The new build is
+// always kept (just uploaded). No count cap.
+export function buildIndex({ channel, version, commit, buildDate, current, existingDirs }) {
+  const entry = { version, commit, buildDate, dir: version }
+  const kept = (current?.builds ?? []).filter((b) => b.version !== entry.version)
+  let builds = [entry, ...kept]
+  if (existingDirs) builds = builds.filter((b) => b.dir === entry.dir || existingDirs.has(b.dir))
+  return { schema: 1, channel, updated: buildDate, builds }
+}

cli/scripts/lib/edge-manifest.test.ts

@@ -0,0 +1,155 @@
+import { describe, expect, it } from 'vitest'
+import {
+  buildIndex,
+  parseChecksums,
+  parseDirList,
+  renderManifest,
+  resolveTargets,
+} from './edge-manifest.mjs'
+
+const RELEASE = {
+  tagPrefix: 'testctl-v',
+  binName: 'testctl',
+  checksumsSuffix: '.sums',
+  targets: [
+    { id: 'linux-x64', bunTarget: 'bun-linux-x64', exe: false },
+    { id: 'windows-x64', bunTarget: 'bun-windows-x64', exe: true },
+  ],
+}
+
+const VERSION = '7.7.7-edge.2fd7b82'
+const SHA_LINUX = 'a'.repeat(64)
+const SHA_WINDOWS = 'b'.repeat(64)
+
+const CHECKSUMS = [
+  `${SHA_LINUX}  testctl-v${VERSION}-linux-x64`,
+  `${SHA_WINDOWS}  testctl-v${VERSION}-windows-x64.exe`,
+].join('\n')
+
+describe('parseChecksums', () => {
+  it('maps asset name to sha256', () => {
+    const map = parseChecksums(CHECKSUMS)
+    expect(map.get(`testctl-v${VERSION}-linux-x64`)).toBe(SHA_LINUX)
+    expect(map.get(`testctl-v${VERSION}-windows-x64.exe`)).toBe(SHA_WINDOWS)
+  })
+
+  it('ignores blank and malformed lines', () => {
+    expect(parseChecksums('\nnot a checksum line\n\n').size).toBe(0)
+  })
+})
+
+describe('parseDirList', () => {
+  it('collects non-blank trimmed lines', () => {
+    expect([...parseDirList('  a \n\n b\n')]).toEqual(['a', 'b'])
+  })
+
+  it('yields an empty set for empty input', () => {
+    expect(parseDirList('').size).toBe(0)
+  })
+})
+
+describe('resolveTargets', () => {
+  it('pairs every target with its sha', () => {
+    const { targets, missing } = resolveTargets(RELEASE, VERSION, parseChecksums(CHECKSUMS))
+    expect(missing).toEqual([])
+    expect(targets).toEqual([
+      { id: 'linux-x64', asset: `testctl-v${VERSION}-linux-x64`, sha: SHA_LINUX },
+      { id: 'windows-x64', asset: `testctl-v${VERSION}-windows-x64.exe`, sha: SHA_WINDOWS },
+    ])
+  })
+
+  it('reports assets with no checksum', () => {
+    const partial = parseChecksums(`${SHA_LINUX}  testctl-v${VERSION}-linux-x64`)
+    const { targets, missing } = resolveTargets(RELEASE, VERSION, partial)
+    expect(targets).toHaveLength(1)
+    expect(missing).toEqual([`testctl-v${VERSION}-windows-x64.exe`])
+  })
+})
+
+describe('renderManifest', () => {
+  const manifest = () =>
+    renderManifest({
+      binName: RELEASE.binName,
+      channel: 'edge',
+      version: VERSION,
+      commit: 'abc1234',
+      buildDate: '2026-06-14T12:00:00Z',
+      compat: { minDify: '2.0.0', maxDify: '2.5.0' },
+      baseUrl: 'https://example.r2.dev/testctl/edge',
+      targets: resolveTargets(RELEASE, VERSION, parseChecksums(CHECKSUMS)).targets,
+    })
+
+  it('emits the pointer fields', () => {
+    const json = JSON.parse(manifest())
+    expect(json).toMatchObject({
+      schema: 1,
+      name: 'testctl',
+      channel: 'edge',
+      version: VERSION,
+      commit: 'abc1234',
+      buildDate: '2026-06-14T12:00:00Z',
+      baseUrl: 'https://example.r2.dev/testctl/edge',
+    })
+  })
+
+  it('carries both compat bounds through unswapped', () => {
+    expect(JSON.parse(manifest()).compat).toEqual({ minDify: '2.0.0', maxDify: '2.5.0' })
+  })
+
+  it('lists each target with asset name and sha256', () => {
+    expect(JSON.parse(manifest()).targets).toEqual({
+      'linux-x64': { asset: `testctl-v${VERSION}-linux-x64`, sha256: SHA_LINUX },
+      'windows-x64': { asset: `testctl-v${VERSION}-windows-x64.exe`, sha256: SHA_WINDOWS },
+    })
+  })
+
+  it('renders each target on a single line (install-r2.sh greps it)', () => {
+    expect(manifest()).toMatch(/^ {4}"linux-x64": \{ "asset": ".*", "sha256": ".*" \}/m)
+  })
+})
+
+describe('buildIndex', () => {
+  const B1 = { version: '7.7.7-edge.aaaaaaa', commit: 'aaaaaaa', buildDate: '2026-06-14T09:00:00Z' }
+  const B2 = { version: '7.7.7-edge.bbbbbbb', commit: 'bbbbbbb', buildDate: '2026-06-14T10:00:00Z' }
+  const entryOf = (b: typeof B1) => ({ ...b, dir: b.version })
+  const build = (over = {}) =>
+    buildIndex({ channel: 'edge', ...B2, current: null, existingDirs: null, ...over })
+
+  it('creates a fresh ledger when there is no current index', () => {
+    const index = build()
+    expect(index).toMatchObject({ schema: 1, channel: 'edge', updated: B2.buildDate })
+    expect(index.builds).toEqual([entryOf(B2)])
+  })
+
+  it('prepends the new build, newest first', () => {
+    const index = build({ current: { builds: [entryOf(B1)] } })
+    expect(index.builds).toEqual([entryOf(B2), entryOf(B1)])
+  })
+
+  it('replaces an existing entry for the same version rather than duplicating', () => {
+    const stale = { ...entryOf(B2), commit: 'oldsha' }
+    const index = build({ current: { builds: [stale, entryOf(B1)] } })
+    expect(index.builds).toEqual([entryOf(B2), entryOf(B1)])
+  })
+
+  it('drops builds whose binaries no longer exist in R2', () => {
+    const index = build({
+      current: { builds: [entryOf(B1)] },
+      existingDirs: new Set<string>(),
+    })
+    expect(index.builds).toEqual([entryOf(B2)])
+  })
+
+  it('keeps builds that still exist in R2', () => {
+    const index = build({
+      current: { builds: [entryOf(B1)] },
+      existingDirs: new Set([B1.version]),
+    })
+    expect(index.builds).toEqual([entryOf(B2), entryOf(B1)])
+  })
+
+  it('reconciles nothing when the caller could not list R2', () => {
+    const index = build({ current: { builds: [entryOf(B1)] }, existingDirs: null })
+    expect(index.builds).toEqual([entryOf(B2), entryOf(B1)])
+  })
+})

cli/scripts/lib/release-rules.mjs

@@ -0,0 +1,115 @@
+// Pure release naming and version rules. Nothing here reads a file, prints, or
+// exits — the CLI shells own all of that.
+
+const BUN_TARGET_RE = /^bun-(linux|darwin|windows)-(x64|arm64)$/
+const SEMVER_CORE_LEN = 3
+
+// Add channels here: { name, prerelease, versionForm }.
+export const CHANNELS = [
+  { name: 'stable', prerelease: false, versionForm: /^\d+\.\d+\.\d+(\+[0-9A-Z.-]+)?$/i },
+  { name: 'alpha', prerelease: true, versionForm: /^\d+\.\d+\.\d+-alpha(\.\d+)?$/ },
+  { name: 'rc', prerelease: true, versionForm: /^\d+\.\d+\.\d+-rc\.\d+$/ },
+  { name: 'edge', prerelease: true, versionForm: /^\d+\.\d+\.\d+-edge\.[0-9a-f]{7,40}$/ },
+]
+
+export const EDGE_SHA_RE = /^[0-9a-f]{7,40}$/
+
+export const channelByName = (name) => CHANNELS.find((c) => c.name === name)
+export const channelNames = () => CHANNELS.map((c) => c.name).join(', ')
+
+export function versionCore(v) {
+  return String(v).replace(/^v/, '').replace(/\+.*$/, '').split('-')[0]
+}
+
+// Compat ordering compares the numeric A.B.C core only: prerelease and build
+// suffixes are stripped first, so 1.16.0-rc.1 ranks equal to 1.16.0. This
+// matches the runtime check in src/version/compat.ts.
+function compareCore(a, b) {
+  const A = versionCore(a).split('.').map(Number)
+  const B = versionCore(b).split('.').map(Number)
+  for (let i = 0; i < SEMVER_CORE_LEN; i++) {
+    const x = A[i] ?? 0
+    const y = B[i] ?? 0
+    if (x !== y) return x < y ? -1 : 1
+  }
+  return 0
+}
+
+export function isWithinCompatWindow(version, { minDify, maxDify }) {
+  return compareCore(version, minDify) >= 0 && compareCore(version, maxDify) <= 0
+}
+
+// Returns a problem string if `version` cannot be resolved under `channel`,
+// else null.
+export function channelVersionProblem(version, channel) {
+  if (typeof version !== 'string' || version.length === 0)
+    return 'version must be a non-empty string'
+  const ch = channelByName(channel)
+  if (!ch) return `unknown channel: ${channel} (expected one of: ${channelNames()})`
+  if (!ch.versionForm.test(version))
+    return `version ${version} does not match the ${channel} channel form`
+  return null
+}
+
+// Returns a problem string if the edge base cannot be derived, else null.
+export function edgeVersionProblem(version, sha) {
+  if (!EDGE_SHA_RE.test(sha ?? '')) return 'edge-version requires a git short sha (7-40 hex chars)'
+  if (!/^\d+\.\d+\.\d+$/.test(versionCore(version)))
+    return `cannot derive edge base from version: ${version}`
+  return null
+}
+
+export function edgeVersionFrom(version, sha) {
+  return `${versionCore(version)}-edge.${sha}`
+}
+
+export function tagName(release, version) {
+  return `${release.tagPrefix}${version}`
+}
+
+export function checksumsName(release, version) {
+  return `${release.tagPrefix}${version}${release.checksumsSuffix}`
+}
+
+export function assetNameFor(release, version, id) {
+  const target = release.targets.find((t) => t.id === id)
+  if (!target) return null
+  return `${release.tagPrefix}${version}-${id}${target.exe ? '.exe' : ''}`
+}
+
+export function compatProblems(compat) {
+  const str = (v) => typeof v === 'string' && v.length > 0
+  const problems = []
+  if (!str(compat?.minDify)) problems.push('compat.minDify must be a non-empty string')
+  if (!str(compat?.maxDify)) problems.push('compat.maxDify must be a non-empty string')
+  if (problems.length === 0 && compareCore(compat.minDify, compat.maxDify) > 0)
+    problems.push(
+      `compat.minDify ${compat.minDify} must not exceed compat.maxDify ${compat.maxDify}`,
+    )
+  return problems
+}
+
+export function releaseConfigProblems(release) {
+  const problems = []
+  const str = (v) => typeof v === 'string' && v.length > 0
+  if (!str(release.tagPrefix)) problems.push('tagPrefix must be a non-empty string')
+  if (!str(release.binName)) problems.push('binName must be a non-empty string')
+  if (!str(release.checksumsSuffix)) problems.push('checksumsSuffix must be a non-empty string')
+  if (!Array.isArray(release.targets) || release.targets.length === 0) {
+    problems.push('targets must be a non-empty array')
+    return problems
+  }
+  const seen = new Set()
+  for (const t of release.targets) {
+    const label = t?.id ?? JSON.stringify(t)
+    if (!str(t?.id)) problems.push(`target ${label}: id must be a non-empty string`)
+    else if (seen.has(t.id)) problems.push(`duplicate target id: ${t.id}`)
+    else seen.add(t.id)
+    if (!str(t?.bunTarget) || !BUN_TARGET_RE.test(t.bunTarget))
+      problems.push(`target ${label}: bunTarget must match ${BUN_TARGET_RE}`)
+    if (typeof t?.exe !== 'boolean') problems.push(`target ${label}: exe must be a boolean`)
+    else if (str(t?.bunTarget) && t.exe !== t.bunTarget.startsWith('bun-windows-'))
+      problems.push(`target ${label}: exe must be true iff bunTarget is bun-windows-*`)
+  }
+  return problems
+}

cli/scripts/lib/release-rules.test.ts

@@ -0,0 +1,183 @@
+import { describe, expect, it } from 'vitest'
+import {
+  assetNameFor,
+  channelVersionProblem,
+  checksumsName,
+  compatProblems,
+  edgeVersionFrom,
+  edgeVersionProblem,
+  isWithinCompatWindow,
+  releaseConfigProblems,
+  tagName,
+} from './release-rules.mjs'
+
+const RELEASE = {
+  tagPrefix: 'testctl-v',
+  binName: 'testctl',
+  checksumsSuffix: '.sums',
+  targets: [
+    { id: 'linux-x64', bunTarget: 'bun-linux-x64', exe: false },
+    { id: 'windows-x64', bunTarget: 'bun-windows-x64', exe: true },
+  ],
+}
+
+const WINDOW = { minDify: '2.0.0', maxDify: '2.5.0' }
+
+describe('isWithinCompatWindow', () => {
+  it.each([
+    ['2.3.0', true, 'inside the window'],
+    ['2.0.0', true, 'the inclusive lower bound'],
+    ['2.5.0', true, 'the inclusive upper bound'],
+    ['v2.3.0', true, 'a v-prefixed tag'],
+    ['1.9.9', false, 'below the lower bound'],
+    ['2.5.1', false, 'above the upper bound'],
+  ])('%s -> %s (%s)', (version, expected) => {
+    expect(isWithinCompatWindow(version, WINDOW)).toBe(expected)
+  })
+
+  it.each([
+    ['2.0.0-rc.1', true, 'a prerelease of the lower bound ranks equal to it'],
+    ['2.5.0-rc.1', true, 'a prerelease of the upper bound ranks equal to it'],
+    ['2.3.0-alpha.7+build9', true, 'both suffixes stripped before comparing'],
+    ['2.5.0+build123', true, 'build metadata on the upper bound'],
+    ['2.5.1-rc.1', false, 'a prerelease whose core is above the window'],
+    ['1.9.9-rc.1', false, 'a prerelease whose core is below the window'],
+    ['2.5.1+build123', false, 'build metadata out of range'],
+  ])('ignores suffixes: %s -> %s (%s)', (version, expected) => {
+    expect(isWithinCompatWindow(version, WINDOW)).toBe(expected)
+  })
+})
+
+describe('channelVersionProblem', () => {
+  it.each([
+    ['1.2.3', 'stable'],
+    ['1.2.3+build', 'stable'],
+    ['1.2.3-alpha', 'alpha'],
+    ['1.2.3-alpha.4', 'alpha'],
+    ['1.2.3-rc.4', 'rc'],
+    ['1.2.3-edge.2fd7b82', 'edge'],
+  ])('accepts %s on the %s channel', (version, channel) => {
+    expect(channelVersionProblem(version, channel)).toBeNull()
+  })
+
+  it.each([
+    ['1.2.3-rc.1', 'edge'],
+    ['1.2.3-alpha', 'stable'],
+    ['1.2.3', 'rc'],
+  ])('rejects %s on the %s channel', (version, channel) => {
+    expect(channelVersionProblem(version, channel)).toMatch(/does not match the .* channel form/)
+  })
+
+  it('rejects an unknown channel', () => {
+    expect(channelVersionProblem('1.2.3', 'nightly')).toMatch(/unknown channel/)
+  })
+
+  it('rejects an empty version', () => {
+    expect(channelVersionProblem('', 'stable')).toMatch(/non-empty string/)
+  })
+})
+
+describe('edge version derivation', () => {
+  it('derives <core>-edge.<sha>, dropping the prerelease', () => {
+    expect(edgeVersionProblem('3.4.5-alpha', '2fd7b82')).toBeNull()
+    expect(edgeVersionFrom('3.4.5-alpha', '2fd7b82')).toBe('3.4.5-edge.2fd7b82')
+  })
+
+  it('accepts a 40-char sha', () => {
+    const sha = '2fd7b829e1f0aaaabbbbccccddddeeeeffff0000'
+    expect(edgeVersionProblem('3.4.5-alpha', sha)).toBeNull()
+    expect(edgeVersionFrom('3.4.5-alpha', sha)).toBe(`3.4.5-edge.${sha}`)
+  })
+
+  it.each([['nothex!'], [''], ['abc'], [undefined]])('rejects sha %s', (sha) => {
+    expect(edgeVersionProblem('3.4.5-alpha', sha)).toMatch(/git short sha/)
+  })
+
+  it('rejects a version with no derivable core', () => {
+    expect(edgeVersionProblem('not-a-version', '2fd7b82')).toMatch(/cannot derive edge base/)
+  })
+})
+
+describe('artifact names', () => {
+  it('builds the tag and checksums names from the prefix', () => {
+    expect(tagName(RELEASE, '9.9.9')).toBe('testctl-v9.9.9')
+    expect(checksumsName(RELEASE, '9.9.9')).toBe('testctl-v9.9.9.sums')
+  })
+
+  it('appends .exe only for targets flagged exe', () => {
+    expect(assetNameFor(RELEASE, '9.9.9', 'linux-x64')).toBe('testctl-v9.9.9-linux-x64')
+    expect(assetNameFor(RELEASE, '9.9.9', 'windows-x64')).toBe('testctl-v9.9.9-windows-x64.exe')
+  })
+
+  it('returns null for an unknown target id', () => {
+    expect(assetNameFor(RELEASE, '9.9.9', 'solaris-sparc')).toBeNull()
+  })
+})
+
+describe('compatProblems', () => {
+  it('accepts a well-formed window', () => {
+    expect(compatProblems(WINDOW)).toEqual([])
+    expect(compatProblems({ minDify: '2.0.0', maxDify: '2.0.0' })).toEqual([])
+  })
+
+  it.each([
+    [undefined, /minDify must be a non-empty string/],
+    [{ maxDify: '2.5.0' }, /minDify must be a non-empty string/],
+    [{ minDify: '2.0.0' }, /maxDify must be a non-empty string/],
+    [{ minDify: '', maxDify: '' }, /minDify must be a non-empty string/],
+  ])('flags a missing bound', (compat, expected) => {
+    expect(compatProblems(compat).join('\n')).toMatch(expected)
+  })
+
+  it('compares bounds by core, so suffixes do not make a window inverted', () => {
+    expect(compatProblems({ minDify: '2.0.0-rc.1', maxDify: '2.0.0' })).toEqual([])
+  })
+
+  it('flags an inverted window', () => {
+    expect(compatProblems({ minDify: '2.5.0', maxDify: '2.0.0' }).join('\n')).toMatch(
+      /must not exceed/,
+    )
+  })
+})
+
+describe('releaseConfigProblems', () => {
+  it('accepts a well-formed config', () => {
+    expect(releaseConfigProblems(RELEASE)).toEqual([])
+  })
+
+  it.each([
+    [{ ...RELEASE, tagPrefix: '' }, /tagPrefix must be a non-empty string/],
+    [{ ...RELEASE, binName: '' }, /binName must be a non-empty string/],
+    [{ ...RELEASE, checksumsSuffix: '' }, /checksumsSuffix must be a non-empty string/],
+    [{ ...RELEASE, targets: [] }, /targets must be a non-empty array/],
+    [{ ...RELEASE, targets: undefined }, /targets must be a non-empty array/],
+  ])('flags a malformed field', (release, expected) => {
+    expect(releaseConfigProblems(release).join('\n')).toMatch(expected)
+  })
+
+  it('flags a duplicate target id', () => {
+    const release = { ...RELEASE, targets: [RELEASE.targets[0], { ...RELEASE.targets[0] }] }
+    expect(releaseConfigProblems(release).join('\n')).toMatch(/duplicate target id: linux-x64/)
+  })
+
+  it('flags a bunTarget that is not a bun triple', () => {
+    const release = { ...RELEASE, targets: [{ id: 'a', bunTarget: 'linux-x64', exe: false }] }
+    expect(releaseConfigProblems(release).join('\n')).toMatch(/bunTarget must match/)
+  })
+
+  it('flags exe disagreeing with a windows bunTarget', () => {
+    const release = {
+      ...RELEASE,
+      targets: [{ id: 'windows-x64', bunTarget: 'bun-windows-x64', exe: false }],
+    }
+    expect(releaseConfigProblems(release).join('\n')).toMatch(/exe must be true iff/)
+  })
+
+  it('flags a non-boolean exe', () => {
+    const release = {
+      ...RELEASE,
+      targets: [{ id: 'linux-x64', bunTarget: 'bun-linux-x64', exe: 'no' }],
+    }
+    expect(releaseConfigProblems(release).join('\n')).toMatch(/exe must be a boolean/)
+  })
+})

cli/scripts/release-config.test.ts

@@ -0,0 +1,72 @@
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import { describe, expect, it } from 'vitest'
+import { main } from './release-naming.mjs'
+
+const env = Object.fromEntries(
+  main(['github-env'])
+    .split('\n')
+    .filter(Boolean)
+    .map((line: string) => line.split(/=(.*)/s).slice(0, 2)),
+)
+
+// Install scripts run standalone on an end user's machine — no repo, no node —
+// so they hardcode artifact names instead of asking release-naming.mjs. These
+// checks are what keeps the two copies from drifting: change the naming config
+// and they fail until the installers are updated to match.
+const INSTALLERS = ['install-cli.sh', 'install-r2.sh', 'install.ps1', 'install-r2.ps1']
+const installerText = (name: string) =>
+  readFileSync(fileURLToPath(new URL(`./${name}`, import.meta.url)), 'utf8')
+
+const CHECKSUMS_SUFFIX = main(['checksums', '1.2.3']).trim().replace(`${env.tagPrefix}1.2.3`, '')
+
+const EXE_TARGET_ID = main(['targets'])
+  .trim()
+  .split('\n')
+  .map((line: string) => line.split('\t'))
+  .find(([, , exe]: string[]) => exe === '1')?.[1]
+
+describe('install scripts stay aligned with the release naming config', () => {
+  it.each(INSTALLERS)('%s uses the configured tag prefix', (name) => {
+    expect(installerText(name)).toContain(env.tagPrefix)
+  })
+
+  it.each(INSTALLERS)('%s uses the configured checksums suffix', (name) => {
+    expect(installerText(name)).toContain(CHECKSUMS_SUFFIX)
+  })
+
+  it.each(['install.ps1', 'install-r2.ps1'])('%s targets the declared windows build', (name) => {
+    expect(EXE_TARGET_ID).toBeTruthy()
+    expect(installerText(name)).toContain(EXE_TARGET_ID)
+  })
+})
+
+describe('the shipped difyctl release config', () => {
+  it('passes the release gate (`release-naming.mjs validate`)', () => {
+    expect(main(['validate'])).toMatch(/^difyctl release valid:/)
+  })
+
+  it('declares a usable, correctly ordered compat window', () => {
+    expect(main(['compat-check', env.minDify])).toContain('compatible')
+    expect(main(['compat-check', env.maxDify])).toContain('compatible')
+  })
+
+  it('gates a Dify version outside the declared window', () => {
+    const aboveMax = `${Number(env.maxDify.split('.')[0]) + 1}.0.0`
+    expect(() => main(['compat-check', aboveMax])).toThrow('outside difyctl compatibility window')
+    expect(() => main(['compat-check', '0.0.1'])).toThrow('outside difyctl compatibility window')
+  })
+
+  it('declares a version valid for the channel it ships on', () => {
+    expect(main(['validate-version', env.version, env.channel])).toContain('valid')
+  })
+
+  it('can name an artifact for every target it declares', () => {
+    const ids = main(['targets'])
+      .trim()
+      .split('\n')
+      .map((line: string) => line.split('\t')[1])
+    expect(ids.length).toBeGreaterThan(0)
+    for (const id of ids) expect(main(['asset', env.version, id])).toContain(id)
+  })
+})

cli/scripts/release-naming.mjs

@@ -1,9 +1,8 @@
-#!/usr/bin/env node
 // release-naming.mjs — single source of truth for difyctl release artifact
 // names and version/channel rules. Reads DATA from cli/package.json
-// `difyctl.release` (plus `version` and `difyctl.channel`) and owns the name
-// FORMAT and the per-channel version form. Producer scripts call this;
-// `validate` is the release gate.
+// `difyctl.release` (plus `version` and `difyctl.channel`); the name FORMAT and
+// the per-channel version form live in lib/release-rules.mjs. Producer scripts
+// call this; `validate` is the release gate.
 //
 // Subcommands:
 //   tag <version>          -> <tagPrefix><version>
@@ -19,109 +18,31 @@
 
 import { readFileSync, realpathSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
+import {
+  assetNameFor,
+  channelByName,
+  channelNames,
+  CHANNELS,
+  channelVersionProblem,
+  checksumsName,
+  compatProblems,
+  edgeVersionFrom,
+  edgeVersionProblem,
+  isWithinCompatWindow,
+  releaseConfigProblems,
+  tagName,
+} from './lib/release-rules.mjs'
 
-const BUN_TARGET_RE = /^bun-(linux|darwin|windows)-(x64|arm64)$/
-const SEMVER_CORE_LEN = 3
+const PKG_URL = new URL('../package.json', import.meta.url)
 
-// Add channels here: { name, prerelease, versionForm }.
-const CHANNELS = [
-  { name: 'stable', prerelease: false, versionForm: /^\d+\.\d+\.\d+(\+[0-9A-Z.-]+)?$/i },
-  { name: 'alpha', prerelease: true, versionForm: /^\d+\.\d+\.\d+-alpha(\.\d+)?$/ },
-  { name: 'rc', prerelease: true, versionForm: /^\d+\.\d+\.\d+-rc\.\d+$/ },
-  { name: 'edge', prerelease: true, versionForm: /^\d+\.\d+\.\d+-edge\.[0-9a-f]{7,40}$/ },
-]
+class UsageError extends Error {}
 
-const channelByName = (name) => CHANNELS.find((c) => c.name === name)
-const channelNames = () => CHANNELS.map((c) => c.name).join(', ')
-
-function parsePrecedence(v) {
-  const s = String(v).replace(/^v/, '').replace(/\+.*$/, '')
-  const i = s.indexOf('-')
-  const core = i === -1 ? s : s.slice(0, i)
-  const pre = i === -1 ? '' : s.slice(i + 1)
-  return { nums: core.split('.').map(Number), pre }
+// Arrow so TS infers `never`, keeping expression positions like `x ?? die(...)` typed.
+const die = (msg) => {
+  throw new UsageError(msg)
 }
 
-function versionCore(v) {
-  return String(v).replace(/^v/, '').replace(/\+.*$/, '').split('-')[0]
-}
-
-function edgeVersion(sha) {
-  if (!/^[0-9a-f]{7,40}$/.test(sha ?? ''))
-    die('edge-version requires a git short sha (7-40 hex chars)')
-  const { version } = loadPkg()
-  const core = versionCore(version)
-  if (!/^\d+\.\d+\.\d+$/.test(core)) die(`cannot derive edge base from version: ${version}`)
-  return `${core}-edge.${sha}`
-}
-
-// Returns a problem string if `version` cannot be resolved under `channel`, else
-// null. Shared by validateVersionForChannel (die-now) and validateVersionChannel
-// (collect for the `validate` gate).
-function channelVersionProblem(version, channel) {
-  if (typeof version !== 'string' || version.length === 0)
-    return 'version must be a non-empty string'
-  const ch = channelByName(channel)
-  if (!ch) return `unknown channel: ${channel} (expected one of: ${channelNames()})`
-  if (!ch.versionForm.test(version))
-    return `version ${version} does not match the ${channel} channel form`
-  return null
-}
-
-function validateVersionForChannel(version, channelName) {
-  const problem = channelVersionProblem(version, channelName)
-  if (problem) die(problem)
-  return `valid: ${version} is a ${channelName} version`
-}
-
-function comparePre(a, b) {
-  const aparts = a.split('.')
-  const bparts = b.split('.')
-  const len = Math.max(aparts.length, bparts.length)
-  for (let i = 0; i < len; i++) {
-    if (aparts[i] === undefined) return -1
-    if (bparts[i] === undefined) return 1
-    const an = /^\d+$/.test(aparts[i])
-    const bn = /^\d+$/.test(bparts[i])
-    if (an && bn) {
-      const d = Number(aparts[i]) - Number(bparts[i])
-      if (d !== 0) return d < 0 ? -1 : 1
-    } else if (an !== bn) {
-      return an ? -1 : 1
-    } else if (aparts[i] !== bparts[i]) {
-      return aparts[i] < bparts[i] ? -1 : 1
-    }
-  }
-  return 0
-}
-
-function comparePrecedence(a, b) {
-  const A = parsePrecedence(a)
-  const B = parsePrecedence(b)
-  for (let i = 0; i < SEMVER_CORE_LEN; i++) {
-    const x = A.nums[i] ?? 0
-    const y = B.nums[i] ?? 0
-    if (x !== y) return x < y ? -1 : 1
-  }
-  if (A.pre === B.pre) return 0
-  if (A.pre === '') return 1
-  if (B.pre === '') return -1
-  return comparePre(A.pre, B.pre)
-}
-
-function die(msg) {
-  process.stderr.write(`release-naming: ${msg}\n`)
-  process.exit(1)
-}
-
-// Tests point this at a fixture manifest so their assertions stay fixed while
-// the real version and compat window move with every release. The name is
-// mirrored in test/fixtures/pkg-manifest.ts rather than imported from here,
-// because this file's shebang breaks the Windows test runner.
-const PKG_PATH_ENV = 'DIFYCTL_PKG_PATH'
-
-function loadPkg() {
-  const pkgPath = process.env[PKG_PATH_ENV] || new URL('../package.json', import.meta.url)
+function loadPkg(pkgPath = PKG_URL) {
   const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
   if (!pkg.difyctl?.release) die('cli/package.json missing difyctl.release')
   return {
@@ -142,7 +63,7 @@ function githubEnv() {
     minDify: compat.minDify,
     maxDify: compat.maxDify,
     tagPrefix: release.tagPrefix,
-    difyctlTag: `${release.tagPrefix}${version}`,
+    difyctlTag: tagName(release, version),
   }
   return Object.entries(fields)
     .map(([k, v]) => `${k}=${v}`)
@@ -154,58 +75,19 @@ function requireVersion(version) {
   return version
 }
 
-function assetName(release, version, id) {
-  const target = release.targets.find((t) => t.id === id)
-  if (!target) die(`unknown target id: ${id}`)
-  const suffix = target.exe ? '.exe' : ''
-  return `${release.tagPrefix}${version}-${id}${suffix}`
-}
-
-function validateRelease(release) {
-  const problems = []
-  const str = (v) => typeof v === 'string' && v.length > 0
-  if (!str(release.tagPrefix)) problems.push('tagPrefix must be a non-empty string')
-  if (!str(release.binName)) problems.push('binName must be a non-empty string')
-  if (!str(release.checksumsSuffix)) problems.push('checksumsSuffix must be a non-empty string')
-  if (!Array.isArray(release.targets) || release.targets.length === 0) {
-    problems.push('targets must be a non-empty array')
-    return problems
-  }
-  const seen = new Set()
-  for (const t of release.targets) {
-    const label = t?.id ?? JSON.stringify(t)
-    if (!str(t?.id)) problems.push(`target ${label}: id must be a non-empty string`)
-    else if (seen.has(t.id)) problems.push(`duplicate target id: ${t.id}`)
-    else seen.add(t.id)
-    if (!str(t?.bunTarget) || !BUN_TARGET_RE.test(t.bunTarget))
-      problems.push(`target ${label}: bunTarget must match ${BUN_TARGET_RE}`)
-    if (typeof t?.exe !== 'boolean') problems.push(`target ${label}: exe must be a boolean`)
-    else if (str(t?.bunTarget) && t.exe !== t.bunTarget.startsWith('bun-windows-'))
-      problems.push(`target ${label}: exe must be true iff bunTarget is bun-windows-*`)
-  }
-  return problems
-}
-
-function validateVersionChannel(version, channel) {
-  const problem = channelVersionProblem(version, channel)
-  return problem ? [problem] : []
-}
-
 function main(argv) {
   const [cmd, ...rest] = argv
   switch (cmd) {
     case 'tag':
-      return `${loadPkg().release.tagPrefix}${requireVersion(rest[0])}`
-    case 'asset':
-      return assetName(
-        loadPkg().release,
-        requireVersion(rest[0]),
-        rest[1] ?? die('target id is required'),
-      )
-    case 'checksums': {
+      return tagName(loadPkg().release, requireVersion(rest[0]))
+    case 'asset': {
       const { release } = loadPkg()
-      return `${release.tagPrefix}${requireVersion(rest[0])}${release.checksumsSuffix}`
+      const version = requireVersion(rest[0])
+      const id = rest[1] ?? die('target id is required')
+      return assetNameFor(release, version, id) ?? die(`unknown target id: ${id}`)
     }
+    case 'checksums':
+      return checksumsName(loadPkg().release, requireVersion(rest[0]))
     case 'tag-prefix':
       return loadPkg().release.tagPrefix
     case 'targets':
@@ -221,10 +103,7 @@ function main(argv) {
       const difyVersion = requireVersion(rest[0])
       if (!compat.minDify || !compat.maxDify)
         die('cli/package.json missing difyctl.compat.minDify/maxDify')
-      if (
-        comparePrecedence(difyVersion, compat.minDify) < 0 ||
-        comparePrecedence(difyVersion, compat.maxDify) > 0
-      )
+      if (!isWithinCompatWindow(difyVersion, compat))
         die(
           `Dify ${difyVersion} is outside difyctl compatibility window ${compat.minDify}..${compat.maxDify}; bump difyctl.compat in cli/package.json`,
         )
@@ -236,19 +115,31 @@ function main(argv) {
       return String(ch.prerelease)
     }
     case 'validate': {
-      const { version, channel, release } = loadPkg()
-      const problems = [...validateRelease(release), ...validateVersionChannel(version, channel)]
+      const { version, channel, compat, release } = loadPkg()
+      const versionProblem = channelVersionProblem(version, channel)
+      const problems = [
+        ...releaseConfigProblems(release),
+        ...compatProblems(compat),
+        ...(versionProblem ? [versionProblem] : []),
+      ]
       if (problems.length > 0)
         die(`invalid difyctl release config:\n  - ${problems.join('\n  - ')}`)
       return `difyctl release valid: version=${version} channel=${channel} targets=${release.targets.length}`
     }
-    case 'edge-version':
-      return edgeVersion(rest[0])
-    case 'validate-version':
-      return validateVersionForChannel(
-        requireVersion(rest[0]),
-        rest[1] ?? die('channel argument is required'),
-      )
+    case 'edge-version': {
+      const { version } = loadPkg()
+      const sha = rest[0]
+      const problem = edgeVersionProblem(version, sha)
+      if (problem) die(problem)
+      return edgeVersionFrom(version, sha)
+    }
+    case 'validate-version': {
+      const version = requireVersion(rest[0])
+      const channel = rest[1] ?? die('channel argument is required')
+      const problem = channelVersionProblem(version, channel)
+      if (problem) die(problem)
+      return `valid: ${version} is a ${channel} version`
+    }
     default:
       die(`unknown subcommand: ${cmd ?? '(none)'}`)
   }
@@ -256,14 +147,14 @@ function main(argv) {
 
 const invokedDirectly =
   process.argv[1] && realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)
-if (invokedDirectly) process.stdout.write(`${main(process.argv.slice(2))}\n`)
-
-export {
-  assetName,
-  channelByName,
-  CHANNELS,
-  edgeVersion,
-  loadPkg,
-  validateVersionForChannel,
-  versionCore,
+if (invokedDirectly) {
+  try {
+    process.stdout.write(`${main(process.argv.slice(2))}\n`)
+  } catch (e) {
+    if (!(e instanceof UsageError)) throw e
+    process.stderr.write(`release-naming: ${e.message}\n`)
+    process.exit(1)
+  }
 }
+
+export { loadPkg, main }

cli/scripts/release-naming.test.ts

@@ -1,122 +1,77 @@
-import { execFileSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { FIXTURE_COMPAT, pkgManifestEnv } from '../test/fixtures/pkg-manifest'
+import { main } from './release-naming.mjs'
 
-const SCRIPT = fileURLToPath(new URL('./release-naming.mjs', import.meta.url))
-
-function run(
-  args: string[],
-  env: Record<string, string> = {},
-): { code: number; stdout: string; stderr: string } {
-  try {
-    const stdout = execFileSync('node', [SCRIPT, ...args], {
-      encoding: 'utf8',
-      env: { ...process.env, ...env },
-    })
-    return { code: 0, stdout, stderr: '' }
-  } catch (e) {
-    const err = e as { status?: number; stdout?: string; stderr?: string }
-    return { code: err.status ?? 1, stdout: err.stdout ?? '', stderr: err.stderr ?? '' }
-  }
-}
-
-describe('release-naming compat-check', () => {
-  const { minDify, maxDify } = FIXTURE_COMPAT // 2.0.0 .. 2.5.0
-  const pkgEnv = pkgManifestEnv()
-  const compatCheck = (difyVersion?: string) =>
-    run(difyVersion === undefined ? ['compat-check'] : ['compat-check', difyVersion], pkgEnv).code
-
-  it('accepts a version inside the window', () => {
-    expect(compatCheck('2.3.0')).toBe(0)
+describe('release-naming argument handling', () => {
+  it.each([
+    [['tag'], 'version argument is required'],
+    [['asset'], 'version argument is required'],
+    [['checksums'], 'version argument is required'],
+    [['compat-check'], 'version argument is required'],
+    [['validate-version'], 'version argument is required'],
+    [['prerelease'], 'channel argument is required'],
+    [['edge-version'], 'git short sha'],
+    [['bogus'], 'unknown subcommand'],
+    [[], 'unknown subcommand'],
+  ])('rejects %j', (args, message) => {
+    expect(() => main(args)).toThrow(message)
   })
 
-  it('accepts the inclusive lower bound', () => {
-    expect(compatCheck(minDify)).toBe(0)
-  })
-
-  it('accepts the inclusive upper bound', () => {
-    expect(compatCheck(maxDify)).toBe(0)
-  })
-
-  it('accepts a v-prefixed tag', () => {
-    expect(compatCheck('v2.3.0')).toBe(0)
-  })
-
-  it('rejects a version below the lower bound', () => {
-    expect(compatCheck('1.9.9')).not.toBe(0)
-  })
-
-  it('rejects a version above the upper bound', () => {
-    expect(compatCheck('2.5.1')).not.toBe(0)
-  })
-
-  it('treats a prerelease of the lower bound as below it', () => {
-    expect(compatCheck(`${minDify}-rc1`)).not.toBe(0)
-  })
-
-  it('ignores build metadata on the bound', () => {
-    expect(compatCheck(`${maxDify}+build123`)).toBe(0)
-  })
-
-  it('ignores build metadata when out of range', () => {
-    expect(compatCheck('2.5.1+build123')).not.toBe(0)
-  })
-
-  it('requires a version argument', () => {
-    expect(compatCheck()).not.toBe(0)
+  it('rejects an unknown target id', () => {
+    expect(() => main(['asset', '9.9.9', 'solaris-sparc'])).toThrow('unknown target id')
   })
 })
 
-describe('release-naming github-env', () => {
-  it('emits difyctlTag = tagPrefix + version', () => {
-    const { stdout } = run(['github-env'])
-    expect(stdout).toMatch(/^difyctlTag=difyctl-v0\.2\.0-alpha$/m)
+describe('release-naming output shape', () => {
+  it('emits every key CI reads from github-env', () => {
+    const out = main(['github-env'])
+    for (const key of [
+      'version',
+      'channel',
+      'prerelease',
+      'minDify',
+      'maxDify',
+      'tagPrefix',
+      'difyctlTag',
+    ])
+      expect(out).toMatch(new RegExp(`^${key}=.+$`, 'm'))
+    expect(out).not.toMatch(/=undefined$/m)
   })
 
-  it('still emits the existing trace fields', () => {
-    const { stdout } = run(['github-env'])
-    for (const key of ['version', 'channel', 'prerelease', 'minDify', 'maxDify', 'tagPrefix'])
-      expect(stdout).toMatch(new RegExp(`^${key}=`, 'm'))
+  it('emits difyctlTag as tagPrefix immediately followed by version', () => {
+    const env = Object.fromEntries(
+      main(['github-env'])
+        .split('\n')
+        .filter(Boolean)
+        .map((line: string) => line.split(/=(.*)/s).slice(0, 2)),
+    )
+    expect(env.difyctlTag).toBe(`${env.tagPrefix}${env.version}`)
   })
 
-  // The only assertion against the live manifest: the window must exist and be
-  // well-formed, whatever release it currently points at.
-  it('emits a well-formed compat window from the real cli/package.json', () => {
-    const { stdout } = run(['github-env'])
-    expect(stdout).toMatch(/^minDify=\d+\.\d+\.\d+$/m)
-    expect(stdout).toMatch(/^maxDify=\d+\.\d+\.\d+$/m)
+  it('lists one channel per line, including edge', () => {
+    const out = main(['channels'])
+    expect(out.trim().split('\n').length).toBeGreaterThan(1)
+    expect(out).toMatch(/^edge$/m)
   })
-})
 
-describe('release-naming edge channel', () => {
-  it('lists edge among channels', () => {
-    expect(run(['channels']).stdout).toMatch(/^edge$/m)
+  it('emits targets as bunTarget<TAB>id<TAB>0|1 (release-build.sh parses this)', () => {
+    for (const line of main(['targets']).trim().split('\n'))
+      expect(line).toMatch(/^\S+\t\S+\t[01]$/)
   })
 
-  it('edge-version derives <pkgcore>-edge.<sha> from the package version', () => {
-    // package.json version is 0.2.0-alpha -> core 0.2.0
-    expect(run(['edge-version', '2fd7b82']).stdout.trim()).toBe('0.2.0-edge.2fd7b82')
+  it('reports prerelease as a boolean per channel', () => {
+    expect(main(['prerelease', 'stable']).trim()).toBe('false')
+    expect(main(['prerelease', 'alpha']).trim()).toBe('true')
+    expect(() => main(['prerelease', 'nightly'])).toThrow('unknown channel')
   })
 
-  it('edge-version accepts a 40-char sha', () => {
-    const sha = '2fd7b829e1f0aaaabbbbccccddddeeeeffff0000'
-    expect(run(['edge-version', sha]).stdout.trim()).toBe(`0.2.0-edge.${sha}`)
+  it('derives an edge version from the packaged version and a sha', () => {
+    expect(main(['edge-version', '2fd7b82']).trim()).toMatch(/-edge\.2fd7b82$/)
   })
 
-  it('edge-version rejects a non-hex sha', () => {
-    expect(run(['edge-version', 'nothex!']).code).not.toBe(0)
-  })
-
-  it('edge-version requires a sha argument', () => {
-    expect(run(['edge-version']).code).not.toBe(0)
-  })
-
-  it('the edge version form matches a computed edge version', () => {
-    expect(run(['validate-version', '0.1.0-edge.2fd7b82', 'edge']).code).toBe(0)
-  })
-
-  it('validate-version rejects an rc string under the edge channel', () => {
-    expect(run(['validate-version', '0.1.0-rc.1', 'edge']).code).not.toBe(0)
+  it('validates a version against a channel form', () => {
+    expect(main(['validate-version', '0.1.0-edge.2fd7b82', 'edge'])).toContain('valid')
+    expect(() => main(['validate-version', '0.1.0-rc.1', 'edge'])).toThrow(
+      'does not match the edge channel form',
+    )
   })
 })

cli/scripts/release-r2-edge.mjs

@@ -1,13 +1,23 @@
-#!/usr/bin/env node
 // release-r2-edge.mjs — edge/R2 release metadata generator. Two subcommands:
 //   manifest  -> the per-channel pointer manifest.json (the installer reads this)
 //   index     -> the per-channel build-history ledger index.json
-import { existsSync, readFileSync } from 'node:fs'
-import { assetName, loadPkg, validateVersionForChannel } from './release-naming.mjs'
+import { existsSync, readFileSync, realpathSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import {
+  buildIndex,
+  parseChecksums,
+  parseDirList,
+  renderManifest,
+  resolveTargets,
+} from './lib/edge-manifest.mjs'
+import { channelVersionProblem } from './lib/release-rules.mjs'
+import { loadPkg } from './release-naming.mjs'
 
-function die(msg) {
-  process.stderr.write(`release-r2-edge: ${msg}\n`)
-  process.exit(1)
+class UsageError extends Error {}
+
+// Arrow so TS infers `never`, keeping expression positions like `return die(...)` typed.
+const die = (msg) => {
+  throw new UsageError(msg)
 }
 
 function parseArgs(argv) {
@@ -28,104 +38,83 @@ function requireArgs(args, keys) {
   }
 }
 
-// checksums lines are "<sha256>  <assetName>"
-function shaMap(checksumsPath) {
-  const map = new Map()
-  for (const line of readFileSync(checksumsPath, 'utf8').split('\n')) {
-    const m = line.match(/^([0-9a-f]{64})\s+(\S+)$/i)
-    if (m) map.set(m[2], m[1])
-  }
-  return map
-}
-
 function emitManifest(args) {
   requireArgs(args, ['channel', 'version', 'commit', 'build-date', 'base-url', 'checksums'])
-  validateVersionForChannel(args.version, args.channel)
+  const versionProblem = channelVersionProblem(args.version, args.channel)
+  if (versionProblem) die(versionProblem)
+
   const { release, compat } = loadPkg()
-  const shas = shaMap(args.checksums)
+  const shas = parseChecksums(readFileSync(args.checksums, 'utf8'))
+  const { targets, missing } = resolveTargets(release, args.version, shas)
+  if (missing.length > 0) die(`no sha256 for ${missing[0]} in ${args.checksums}`)
 
-  const targetLines = release.targets
-    .map((t) => {
-      const asset = assetName(release, args.version, t.id)
-      const sha = shas.get(asset)
-      if (!sha) die(`no sha256 for ${asset} in ${args.checksums}`)
-      // one target per line: install-r2.sh grep/sed depends on this layout
-      return `    ${JSON.stringify(t.id)}: { "asset": ${JSON.stringify(asset)}, "sha256": ${JSON.stringify(sha)} }`
-    })
-    .join(',\n')
-
-  const head = {
-    schema: 1,
-    name: release.binName,
+  return renderManifest({
+    binName: release.binName,
     channel: args.channel,
     version: args.version,
     commit: args.commit,
     buildDate: args['build-date'],
-    compat: { minDify: compat.minDify, maxDify: compat.maxDify },
+    compat,
     baseUrl: args['base-url'],
-  }
-  const headLines = Object.entries(head)
-    .map(([k, v]) => `  ${JSON.stringify(k)}: ${JSON.stringify(v)}`)
-    .join(',\n')
-  process.stdout.write(`{\n${headLines},\n  "targets": {\n${targetLines}\n  }\n}\n`)
+    targets,
+  })
 }
 
-// Newline-delimited dir names of binaries that still exist in R2. Absent file =
-// no reconciliation (caller could not list); empty file = no survivors.
+// empty / "-" / missing = no ledger yet (first publish)
+function loadCurrentIndex(path) {
+  if (path === '-' || !existsSync(path)) return null
+  const raw = readFileSync(path, 'utf8').trim()
+  if (!raw || raw === '-') return null
+  try {
+    return JSON.parse(raw)
+  } catch {
+    return die(`current index at ${path} is not valid JSON`)
+  }
+}
+
+// Absent file = no reconciliation (caller could not list); empty file = no survivors.
 function loadExistingDirs(path) {
   if (!path || !existsSync(path)) return null
-  const set = new Set()
-  for (const line of readFileSync(path, 'utf8').split('\n')) {
-    const d = line.trim()
-    if (d) set.add(d)
-  }
-  return set
+  return parseDirList(readFileSync(path, 'utf8'))
 }
 
 function emitIndex(args) {
   requireArgs(args, ['current', 'channel', 'version', 'commit', 'build-date'])
-
-  // empty / "-" / missing = no ledger yet (first publish)
-  let current = { schema: 1, channel: args.channel, builds: [] }
-  if (args.current !== '-' && existsSync(args.current)) {
-    const raw = readFileSync(args.current, 'utf8').trim()
-    if (raw && raw !== '-') {
-      try {
-        current = JSON.parse(raw)
-      } catch {
-        die(`current index at ${args.current} is not valid JSON`)
-      }
-    }
-  }
-
-  const entry = {
+  const index = buildIndex({
+    channel: args.channel,
     version: args.version,
     commit: args.commit,
     buildDate: args['build-date'],
-    dir: args.version,
+    current: loadCurrentIndex(args.current),
+    existingDirs: loadExistingDirs(args['existing-dirs']),
+  })
+  return `${JSON.stringify(index, null, 2)}\n`
+}
+
+// Returns the exact bytes to write to stdout.
+function main(argv) {
+  const [cmd, ...rest] = argv
+  const args = parseArgs(rest)
+  switch (cmd) {
+    case 'manifest':
+      return emitManifest(args)
+    case 'index':
+      return emitIndex(args)
+    default:
+      return die(`unknown subcommand: ${cmd ?? '(none)'} (expected: manifest | index)`)
   }
-  const kept = (current.builds ?? []).filter((b) => b.version !== entry.version)
-  let builds = [entry, ...kept]
-
-  // Reconcile to binaries that still exist in R2: lifecycle/TTL on the bin prefix
-  // is the only deletion mechanism, so the ledger never advertises a build whose
-  // binary is gone. The new build is always kept (just uploaded). No count cap.
-  const existing = loadExistingDirs(args['existing-dirs'])
-  if (existing) builds = builds.filter((b) => b.dir === entry.dir || existing.has(b.dir))
-
-  const index = { schema: 1, channel: args.channel, updated: args['build-date'], builds }
-  process.stdout.write(`${JSON.stringify(index, null, 2)}\n`)
 }
 
-const [cmd, ...rest] = process.argv.slice(2)
-const args = parseArgs(rest)
-switch (cmd) {
-  case 'manifest':
-    emitManifest(args)
-    break
-  case 'index':
-    emitIndex(args)
-    break
-  default:
-    die(`unknown subcommand: ${cmd ?? '(none)'} (expected: manifest | index)`)
+const invokedDirectly =
+  process.argv[1] && realpathSync(process.argv[1]) === fileURLToPath(import.meta.url)
+if (invokedDirectly) {
+  try {
+    process.stdout.write(main(process.argv.slice(2)))
+  } catch (e) {
+    if (!(e instanceof UsageError)) throw e
+    process.stderr.write(`release-r2-edge: ${e.message}\n`)
+    process.exit(1)
+  }
 }
+
+export { main }

cli/scripts/release-r2-edge.test.ts

@@ -1,49 +1,28 @@
-import { execFileSync, spawnSync } from 'node:child_process'
 import { mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { describe, expect, it } from 'vitest'
-import { FIXTURE_COMPAT, pkgManifestEnv } from '../test/fixtures/pkg-manifest'
-
-const SCRIPT = fileURLToPath(new URL('./release-r2-edge.mjs', import.meta.url))
-
-const PKG_ENV = pkgManifestEnv()
-
-function run(args: string[]): { code: number; stdout: string; stderr: string } {
-  try {
-    return {
-      code: 0,
-      stdout: execFileSync('node', [SCRIPT, ...args], {
-        encoding: 'utf8',
-        env: { ...process.env, ...PKG_ENV },
-      }),
-      stderr: '',
-    }
-  } catch (e) {
-    const err = e as { status?: number; stdout?: string; stderr?: string }
-    return { code: err.status ?? 1, stdout: err.stdout ?? '', stderr: err.stderr ?? '' }
-  }
-}
-
-// ---- manifest ----
-
-function writeChecksums(version: string): string {
-  const dir = mkdtempSync(join(tmpdir(), 'difyctl-manifest-'))
-  const ids = ['linux-x64', 'linux-arm64', 'darwin-x64', 'darwin-arm64', 'windows-x64']
-  const lines = ids.map((id, i) => {
-    const exe = id === 'windows-x64' ? '.exe' : ''
-    const sha = String(i).repeat(64)
-    return `${sha}  difyctl-v${version}-${id}${exe}`
-  })
-  const file = join(dir, `difyctl-v${version}-checksums.txt`)
-  writeFileSync(file, `${lines.join('\n')}\n`)
-  return file
-}
+import { main as naming } from './release-naming.mjs'
+import { main } from './release-r2-edge.mjs'
 
 const VERSION = '0.1.0-edge.2fd7b82'
 const BASE_URL = 'https://example.r2.dev/difyctl/edge/0.1.0-edge.2fd7b82'
 
+const TARGET_IDS = naming(['targets'])
+  .trim()
+  .split('\n')
+  .map((line: string) => line.split('\t')[1])
+
+const ASSETS = new Map(TARGET_IDS.map((id: string) => [id, naming(['asset', VERSION, id]).trim()]))
+const assetFor = (id: string) => ASSETS.get(id) ?? ''
+
+const PKG_ENV = Object.fromEntries(
+  naming(['github-env'])
+    .split('\n')
+    .filter(Boolean)
+    .map((line: string) => line.split(/=(.*)/s).slice(0, 2)),
+)
+
 type ManifestJson = {
   schema: number
   name: string
@@ -56,28 +35,23 @@ type ManifestJson = {
   targets: Record<string, { asset: string; sha256: string }>
 }
 
-type IndexBuild = {
-  version: string
-  commit: string
-  buildDate: string
-  dir: string
-}
-
 type IndexJson = {
   schema: number
   channel: string
   updated: string
-  builds: IndexBuild[]
+  builds: { version: string; commit: string; buildDate: string; dir: string }[]
 }
 
-function buildManifest(version = VERSION): {
-  code: number
-  json: ManifestJson
-  stdout: string
-  stderr: string
-} {
-  const checksums = writeChecksums(version)
-  const r = run([
+function writeChecksums(ids: string[]): string {
+  const dir = mkdtempSync(join(tmpdir(), 'difyctl-manifest-'))
+  const lines = ids.map((id, i) => `${String(i).repeat(64)}  ${assetFor(id)}`)
+  const file = join(dir, 'checksums.txt')
+  writeFileSync(file, `${lines.join('\n')}\n`)
+  return file
+}
+
+function manifestArgs(version = VERSION, ids = TARGET_IDS): string[] {
+  return [
     'manifest',
     '--channel',
     'edge',
@@ -90,229 +64,122 @@ function buildManifest(version = VERSION): {
     '--base-url',
     BASE_URL,
     '--checksums',
-    checksums,
-  ])
-  return {
-    code: r.code,
-    json: (r.code === 0 ? JSON.parse(r.stdout) : null) as ManifestJson,
-    stdout: r.stdout,
-    stderr: r.stderr,
-  }
+    writeChecksums(ids),
+  ]
 }
 
+const buildManifest = () => JSON.parse(main(manifestArgs())) as ManifestJson
+
 describe('release-r2-edge manifest', () => {
-  it('emits the core pointer fields', () => {
-    const { json } = buildManifest()
-    expect(json.schema).toBe(1)
-    expect(json.name).toBe('difyctl')
-    expect(json.channel).toBe('edge')
-    expect(json.version).toBe(VERSION)
-    expect(json.commit).toBe('abc1234')
-    expect(json.buildDate).toBe('2026-06-14T12:00:00Z')
-    expect(json.baseUrl).toBe(BASE_URL)
+  it('passes the CLI arguments straight through to the manifest', () => {
+    expect(buildManifest()).toMatchObject({
+      schema: 1,
+      channel: 'edge',
+      version: VERSION,
+      commit: 'abc1234',
+      buildDate: '2026-06-14T12:00:00Z',
+      baseUrl: BASE_URL,
+    })
   })
 
-  it('carries the compat window from package.json', () => {
-    const { json } = buildManifest()
-    expect(json.compat).toEqual(FIXTURE_COMPAT)
+  it('carries the compat window through from cli/package.json', () => {
+    expect(buildManifest().compat).toEqual({ minDify: PKG_ENV.minDify, maxDify: PKG_ENV.maxDify })
   })
 
-  it('lists all 5 targets with asset name + sha256 from the checksums file', () => {
-    const { json } = buildManifest()
-    expect(Object.keys(json.targets).sort()).toEqual([
-      'darwin-arm64',
-      'darwin-x64',
-      'linux-arm64',
-      'linux-x64',
-      'windows-x64',
-    ])
-    expect(json.targets['linux-x64'].asset).toBe(`difyctl-v${VERSION}-linux-x64`)
-    expect(json.targets['windows-x64'].asset).toBe(`difyctl-v${VERSION}-windows-x64.exe`)
-    expect(json.targets['linux-x64'].sha256).toMatch(/^\d{64}$/)
-  })
-
-  it('renders each target on a single line (installer greps it)', () => {
-    const { stdout } = buildManifest()
-    expect(stdout).toMatch(/^ {4}"linux-x64": \{ "asset": ".*", "sha256": ".*" \}/m)
+  it('includes every target the release config declares', () => {
+    expect(Object.keys(buildManifest().targets).sort()).toEqual([...TARGET_IDS].sort())
   })
 
   it('rejects a version that does not match the channel form', () => {
-    const { code } = buildManifest('0.1.0-rc.1')
-    expect(code).not.toBe(0)
+    expect(() => main(manifestArgs('0.1.0-rc.1'))).toThrow('does not match the edge channel form')
   })
 
   it('dies when a target sha is missing from the checksums file', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'difyctl-manifest-'))
-    const file = join(dir, `difyctl-v${VERSION}-checksums.txt`)
-    writeFileSync(file, `${'0'.repeat(64)}  difyctl-v${VERSION}-linux-x64\n`) // only 1 of 5
-    const r = run([
-      'manifest',
-      '--channel',
-      'edge',
-      '--version',
-      VERSION,
-      '--commit',
-      'abc1234',
-      '--build-date',
-      '2026-06-14T12:00:00Z',
-      '--base-url',
-      BASE_URL,
-      '--checksums',
-      file,
-    ])
-    expect(r.code).not.toBe(0)
+    expect(() => main(manifestArgs(VERSION, TARGET_IDS.slice(0, 1)))).toThrow('no sha256 for')
   })
 
   it('rejects a malformed dropped-value argument (no silent misparse)', () => {
     // --version has no value; --commit must NOT be swallowed as the version
-    const r = run([
-      'manifest',
-      '--channel',
-      'edge',
-      '--version',
-      '--commit',
-      'abc1234',
-      '--build-date',
-      '2026-06-14T12:00:00Z',
-      '--base-url',
-      'https://x',
-      '--checksums',
-      '/nonexistent',
-    ])
-    expect(r.code).not.toBe(0)
+    expect(() =>
+      main([
+        'manifest',
+        '--channel',
+        'edge',
+        '--version',
+        '--commit',
+        'abc1234',
+        '--build-date',
+        '2026-06-14T12:00:00Z',
+        '--base-url',
+        'https://x',
+        '--checksums',
+        '/nonexistent',
+      ]),
+    ).toThrow('malformed argument')
+  })
+
+  it('rejects an unknown subcommand', () => {
+    expect(() => main(['bogus'])).toThrow('unknown subcommand')
   })
 })
 
-// ---- index ----
+describe('release-r2-edge index', () => {
+  const B1 = { version: '0.1.0-edge.aaaaaaa', commit: 'aaaaaaa', buildDate: '2026-06-14T09:00:00Z' }
 
-function runIndex(
-  currentContent: string | null,
-  build: Record<string, string>,
-  existingDirs?: string[],
-) {
-  let currentArg = '-'
-  if (currentContent !== null) {
-    const dir = mkdtempSync(join(tmpdir(), 'difyctl-index-'))
-    currentArg = join(dir, 'index.json')
-    writeFileSync(currentArg, currentContent)
-  }
-  const extra: string[] = []
-  if (existingDirs !== undefined) {
-    const dir = mkdtempSync(join(tmpdir(), 'difyctl-existing-'))
-    const f = join(dir, 'existing.txt')
-    writeFileSync(f, `${existingDirs.join('\n')}\n`)
-    extra.push('--existing-dirs', f)
-  }
-  const r = spawnSync(
-    'node',
-    [
-      SCRIPT,
+  function indexArgs(currentContent: string | null, existingDirs?: string[]): string[] {
+    let currentArg = '-'
+    if (currentContent !== null) {
+      currentArg = join(mkdtempSync(join(tmpdir(), 'difyctl-index-')), 'index.json')
+      writeFileSync(currentArg, currentContent)
+    }
+    const extra: string[] = []
+    if (existingDirs !== undefined) {
+      const f = join(mkdtempSync(join(tmpdir(), 'difyctl-existing-')), 'existing.txt')
+      writeFileSync(f, `${existingDirs.join('\n')}\n`)
+      extra.push('--existing-dirs', f)
+    }
+    return [
       'index',
       '--current',
       currentArg,
       '--channel',
       'edge',
       '--version',
-      build.version,
+      B1.version,
       '--commit',
-      build.commit,
+      B1.commit,
       '--build-date',
-      build.buildDate,
+      B1.buildDate,
       ...extra,
-    ],
-    { encoding: 'utf8' },
-  )
-  return {
-    code: r.status ?? 1,
-    index: (r.status === 0 ? JSON.parse(r.stdout) : null) as IndexJson,
+    ]
   }
-}
 
-const B1 = { version: '0.1.0-edge.aaaaaaa', commit: 'aaaaaaa', buildDate: '2026-06-14T09:00:00Z' }
-const B2 = { version: '0.1.0-edge.bbbbbbb', commit: 'bbbbbbb', buildDate: '2026-06-14T10:00:00Z' }
+  const buildIndex = (currentContent: string | null, existingDirs?: string[]) =>
+    JSON.parse(main(indexArgs(currentContent, existingDirs))) as IndexJson
 
-describe('release-r2-edge index', () => {
-  it('creates a fresh index from a missing current (arg "-")', () => {
-    const { index } = runIndex(null, B1)
-    expect(index.schema).toBe(1)
-    expect(index.channel).toBe('edge')
-    expect(index.builds).toHaveLength(1)
-    expect(index.builds[0]).toMatchObject({
-      version: B1.version,
-      commit: B1.commit,
-      dir: B1.version,
-    })
+  it.each([
+    ['a missing current file (arg "-")', null],
+    ['an empty current file (first publish, curl wrote nothing)', ''],
+    ['a "-"-content current file (curl 404 fallback)', '-\n'],
+  ])('treats %s as a fresh ledger', (_label, content) => {
+    const index = buildIndex(content)
+    expect(index).toMatchObject({ schema: 1, channel: 'edge' })
+    expect(index.builds).toEqual([{ ...B1, dir: B1.version }])
   })
 
-  it('treats an empty current file as fresh (first publish, curl wrote nothing)', () => {
-    const { code, index } = runIndex('', B1)
-    expect(code).toBe(0)
-    expect(index.builds).toHaveLength(1)
+  it('dies on a current index that is not valid JSON', () => {
+    expect(() => main(indexArgs('{not json'))).toThrow('not valid JSON')
   })
 
-  it('treats a "-"-content current file as fresh (curl 404 fallback)', () => {
-    const { code, index } = runIndex('-\n', B1)
-    expect(code).toBe(0)
-    expect(index.builds).toHaveLength(1)
-  })
-
-  it('prepends the new build (publish order; newest at [0])', () => {
-    const current = JSON.stringify({
-      schema: 1,
-      channel: 'edge',
-      builds: [
-        { version: B1.version, commit: B1.commit, buildDate: B1.buildDate, dir: B1.version },
-      ],
-    })
-    const { index } = runIndex(current, B2)
-    expect(index.builds.map((b) => b.version)).toEqual([B2.version, B1.version])
-  })
-
-  it('dedups a re-cut of the same version (no duplicate, moves to top)', () => {
-    const current = JSON.stringify({
-      schema: 1,
-      channel: 'edge',
-      builds: [
-        { version: B2.version, commit: B2.commit, buildDate: B2.buildDate, dir: B2.version },
-        { version: B1.version, commit: B1.commit, buildDate: B1.buildDate, dir: B1.version },
-      ],
-    })
-    const { index } = runIndex(current, B1) // re-cut B1
-    expect(index.builds.map((b) => b.version)).toEqual([B1.version, B2.version])
-  })
-
-  it('reconciles to surviving binary dirs (drops a build whose binary expired)', () => {
-    const current = JSON.stringify({
-      schema: 1,
-      channel: 'edge',
-      builds: [
-        { version: B1.version, commit: B1.commit, buildDate: B1.buildDate, dir: B1.version },
-      ],
-    })
-    // B1's binary is gone (not in existing); the new B2 is always kept.
-    const { index } = runIndex(current, B2, [B2.version])
-    expect(index.builds.map((b) => b.version)).toEqual([B2.version])
-  })
-
-  it('keeps the new build even when it is absent from the existing-dirs list', () => {
-    const { index } = runIndex(null, B1, []) // empty survivors, fresh ledger
-    expect(index.builds.map((b) => b.version)).toEqual([B1.version])
-  })
-
-  it('does not reconcile when no --existing-dirs is given (list unavailable)', () => {
-    const current = JSON.stringify({
-      schema: 1,
-      channel: 'edge',
-      builds: [
-        { version: B1.version, commit: B1.commit, buildDate: B1.buildDate, dir: B1.version },
-      ],
-    })
-    const { index } = runIndex(current, B2) // no existing-dirs → keep all
-    expect(index.builds.map((b) => b.version)).toEqual([B2.version, B1.version])
-  })
-
-  it('dies on a non-empty current file that is not valid JSON', () => {
-    const { code } = runIndex('{not json', B1)
-    expect(code).not.toBe(0)
+  it('reads the existing-dirs file to reconcile the ledger', () => {
+    const older = {
+      version: '0.1.0-edge.bbbbbbb',
+      commit: 'bbbbbbb',
+      buildDate: '2026-06-14T08:00:00Z',
+      dir: '0.1.0-edge.bbbbbbb',
+    }
+    const current = JSON.stringify({ schema: 1, channel: 'edge', builds: [older] })
+    expect(buildIndex(current, []).builds).toEqual([{ ...B1, dir: B1.version }])
+    expect(buildIndex(current, [older.dir]).builds).toEqual([{ ...B1, dir: B1.version }, older])
   })
 })

cli/scripts/release-r2-publish.test.ts

@@ -1,91 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { fileURLToPath } from 'node:url'
-import { describe, expect, it } from 'vitest'
-
-const SCRIPT = fileURLToPath(new URL('./release-r2-publish.sh', import.meta.url))
-
-// Stub `aws` + `curl` + `node` as shell functions that just log action verbs to
-// $ORDER_LOG, then run the publish `main` and assert the order of operations.
-function runPublish(): { code: number; order: string[]; stderr: string } {
-  const stub = [
-    'ORDER_LOG="$(mktemp)"',
-    'aws() {',
-    '  case "$*" in',
-    '    *"list-objects-v2"*)       echo list-survivors >>"$ORDER_LOG" ;;',
-    '    *" cp "*"/index.json"*)    echo put-index      >>"$ORDER_LOG" ;;',
-    '    *" cp "*"/manifest.json"*) echo put-manifest   >>"$ORDER_LOG" ;;',
-    '    *" sync "*)                echo sync-binaries   >>"$ORDER_LOG" ;;',
-    '    *"head-object"*)           echo head-verify    >>"$ORDER_LOG" ;;',
-    '    *) : ;;',
-    '  esac',
-    '}',
-    'curl() { echo "{}"; }',
-    'node() {',
-    '  case "$*" in',
-    '    *release-naming.mjs*targets*)',
-    "      printf 'bun-linux-x64\\tlinux-x64\\t0\\nbun-linux-arm64\\tlinux-arm64\\t0\\nbun-darwin-x64\\tdarwin-x64\\t0\\nbun-darwin-arm64\\tdarwin-arm64\\t0\\nbun-windows-x64\\twindows-x64\\t1\\n' ;;",
-    "    *release-naming.mjs*' asset '*)  printf 'difyctl-vX\\n' ;;",
-    "    *release-r2-edge.mjs*' index '*)    echo '{}' ;;",
-    "    *release-r2-edge.mjs*' manifest '*) echo '{}' ;;",
-    '    *) : ;;',
-    '  esac',
-    '}',
-  ].join('\n')
-  const program = [
-    stub,
-    `. "${SCRIPT}"`,
-    'publish_main edge 0.1.0-edge.2fd7b82',
-    'cat "$ORDER_LOG"',
-  ].join('\n')
-  // bash, NOT sh: the script uses BASH_SOURCE + process substitution.
-  const r = spawnSync('bash', ['-c', program], {
-    encoding: 'utf8',
-    env: {
-      ...process.env,
-      RELEASE_PUBLISH_LIB: '1',
-      DIFYCTL_R2_S3_ENDPOINT: 'https://endpoint.example',
-      DIFYCTL_R2_BUCKET: 'cli-dev',
-      DIFYCTL_R2_PUBLIC_BASE: 'https://pub.example.r2.dev',
-      DIST_DIR: '/tmp',
-    },
-  })
-  return {
-    code: r.status ?? 1,
-    order: (r.stdout ?? '').trim().split('\n').filter(Boolean),
-    stderr: r.stderr ?? '',
-  }
-}
-
-describe('release-r2-publish order', () => {
-  it('uploads binaries, verifies, lists survivors, then index, then manifest', () => {
-    const { code, order } = runPublish()
-    expect(code).toBe(0)
-    expect(order.indexOf('sync-binaries')).toBeLessThan(order.indexOf('head-verify'))
-    expect(order.indexOf('head-verify')).toBeLessThan(order.indexOf('list-survivors'))
-    expect(order.indexOf('list-survivors')).toBeLessThan(order.indexOf('put-index'))
-    expect(order.indexOf('put-index')).toBeLessThan(order.indexOf('put-manifest'))
-    // pointer is never pruned here — deletion is owned by the R2 lifecycle rule
-    expect(order).not.toContain('prune')
-  })
-
-  it('exits non-zero when no targets resolve (head-verify safety gate)', () => {
-    const stub = [
-      'aws() { :; }',
-      'curl() { echo "{}"; }',
-      'node() { case "$*" in *release-naming.mjs*targets*) : ;; *) echo "{}" ;; esac; }',
-    ].join('\n')
-    const program = [stub, `. "${SCRIPT}"`, 'publish_main edge 0.1.0-edge.2fd7b82'].join('\n')
-    const r = spawnSync('bash', ['-c', program], {
-      encoding: 'utf8',
-      env: {
-        ...process.env,
-        RELEASE_PUBLISH_LIB: '1',
-        DIFYCTL_R2_S3_ENDPOINT: 'https://endpoint.example',
-        DIFYCTL_R2_BUCKET: 'cli-dev',
-        DIFYCTL_R2_PUBLIC_BASE: 'https://pub.example.r2.dev',
-        DIST_DIR: '/tmp',
-      },
-    })
-    expect(r.status).not.toBe(0)
-  })
-})

cli/test/fixtures/pkg-manifest.ts

@@ -1,57 +0,0 @@
-import { mkdtempSync, writeFileSync } from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-
-// Mirrors PKG_PATH_ENV in scripts/release-naming.mjs, which cannot be imported
-// here: its shebang breaks the Windows test runner. Divergence is self-
-// reporting, not silent — the script would fall back to the real
-// cli/package.json and every fixture-window assertion would fail.
-const PKG_PATH_ENV = 'DIFYCTL_PKG_PATH'
-
-// release-naming.mjs and release-r2-edge.mjs read their data from
-// cli/package.json. Tests spawn them against this fixture instead, so
-// assertions can name exact versions without tracking the live release.
-
-// Deliberately far from any real Dify version, and min != max so "inside the
-// window" is a case distinct from either bound.
-export const FIXTURE_COMPAT = { minDify: '2.0.0', maxDify: '2.5.0' }
-
-export const FIXTURE_TARGET_IDS = [
-  'linux-x64',
-  'linux-arm64',
-  'darwin-x64',
-  'darwin-arm64',
-  'windows-x64',
-] as const
-
-const FIXTURE_RELEASE = {
-  tagPrefix: 'difyctl-v',
-  binName: 'difyctl',
-  checksumsSuffix: '-checksums.txt',
-  targets: FIXTURE_TARGET_IDS.map((id) => ({
-    id,
-    bunTarget: `bun-${id}`,
-    exe: id.startsWith('windows'),
-  })),
-}
-
-export type PkgManifestOverrides = {
-  version?: string
-  channel?: string
-  compat?: { minDify: string; maxDify: string }
-}
-
-// Returns the env additions that point a spawned script at the fixture.
-export function pkgManifestEnv(overrides: PkgManifestOverrides = {}): Record<string, string> {
-  const manifest = {
-    version: overrides.version ?? '0.2.0-alpha',
-    difyctl: {
-      channel: overrides.channel ?? 'alpha',
-      compat: overrides.compat ?? FIXTURE_COMPAT,
-      release: FIXTURE_RELEASE,
-    },
-  }
-  const path = join(mkdtempSync(join(tmpdir(), 'difyctl-pkg-')), 'package.json')
-  writeFileSync(path, JSON.stringify(manifest))
-  return { [PKG_PATH_ENV]: path }
-}

dify-agent/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.12,<4.0"

dify-agent/uv.lock

@@ -581,7 +581,7 @@ wheels = [
 
 [[package]]
 name = "dify-agent"
-version = "1.16.1"
+version = "1.16.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

docker/docker-compose-template.yaml

@@ -220,7 +220,7 @@ services:
   # API service
   api:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -271,7 +271,7 @@ services:
   # WebSocket service for workflow collaboration.
   api_websocket:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     profiles:
       - collaboration
     environment:
@@ -297,7 +297,7 @@ services:
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
     <<: *shared-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -347,7 +347,7 @@ services:
   # Celery beat for scheduling periodic tasks.
   worker_beat:
     <<: *shared-worker-beat-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: beat
     depends_on:
@@ -380,7 +380,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.16.1
+    image: langgenius/dify-web:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/web.env
@@ -542,7 +542,7 @@ services:
   # on port 3128, which only allows agent_backend /agent-stub/ and the Dify API
   # /files/* endpoints (see ssrf_proxy/squid-agent.conf.template).
   local_sandbox:
-    image: langgenius/dify-agent-local-sandbox:1.16.1
+    image: langgenius/dify-agent-local-sandbox:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/local-sandbox.env
@@ -651,7 +651,7 @@ services:
 
   # Dify Agent backend service.
   agent_backend:
-    image: langgenius/dify-agent-backend:1.16.1
+    image: langgenius/dify-agent-backend:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/dify-agent.env

docker/docker-compose.yaml

@@ -226,7 +226,7 @@ services:
   # API service
   api:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -277,7 +277,7 @@ services:
   # WebSocket service for workflow collaboration.
   api_websocket:
     <<: *shared-api-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     profiles:
       - collaboration
     environment:
@@ -303,7 +303,7 @@ services:
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
     <<: *shared-worker-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
@@ -353,7 +353,7 @@ services:
   # Celery beat for scheduling periodic tasks.
   worker_beat:
     <<: *shared-worker-beat-config
-    image: langgenius/dify-api:1.16.1
+    image: langgenius/dify-api:1.16.0
     environment:
       MODE: beat
     depends_on:
@@ -386,7 +386,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.16.1
+    image: langgenius/dify-web:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/web.env
@@ -548,7 +548,7 @@ services:
   # on port 3128, which only allows agent_backend /agent-stub/ and the Dify API
   # /files/* endpoints (see ssrf_proxy/squid-agent.conf.template).
   local_sandbox:
-    image: langgenius/dify-agent-local-sandbox:1.16.1
+    image: langgenius/dify-agent-local-sandbox:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/local-sandbox.env
@@ -657,7 +657,7 @@ services:
 
   # Dify Agent backend service.
   agent_backend:
-    image: langgenius/dify-agent-backend:1.16.1
+    image: langgenius/dify-agent-backend:1.16.0
     restart: always
     env_file:
       - path: ./envs/core-services/dify-agent.env

oxlint-suppressions.json

@@ -3883,6 +3883,11 @@
       "count": 2
     }
   },
+  "web/app/components/workflow-app/hooks/use-workflow-template.ts": {
+    "typescript/no-explicit-any": {
+      "count": 2
+    }
+  },
   "web/app/components/workflow-app/store/workflow/workflow-slice.ts": {
     "typescript/no-explicit-any": {
       "count": 2
@@ -4212,6 +4217,9 @@
   "web/app/components/workflow/nodes/_base/components/memory-config.tsx": {
     "no-restricted-imports": {
       "count": 1
+    },
+    "unicorn/prefer-number-properties": {
+      "count": 1
     }
   },
   "web/app/components/workflow/nodes/_base/components/next-step/operator.tsx": {
@@ -5063,11 +5071,21 @@
       "count": 8
     }
   },
+  "web/app/components/workflow/nodes/start/panel.tsx": {
+    "typescript/no-explicit-any": {
+      "count": 2
+    }
+  },
   "web/app/components/workflow/nodes/start/use-config.ts": {
     "typescript/no-explicit-any": {
       "count": 1
     }
   },
+  "web/app/components/workflow/nodes/start/use-single-run-form-params.ts": {
+    "typescript/no-explicit-any": {
+      "count": 3
+    }
+  },
   "web/app/components/workflow/nodes/template-transform/use-config.ts": {
     "typescript/no-explicit-any": {
       "count": 4

web/app/components/base/chat/chat/answer/__mocks__/workflowProcess.ts

@@ -15,7 +15,7 @@ export const mockedWorkflowProcess = {
       predecessor_node_id: null,
       inputs: {
         'sys.query': 'hi',
-        'userinput.files': [],
+        'sys.files': [],
         'sys.conversation_id': '92ce0a3e-8f15-43d1-b31d-32716c4b10a7',
         'sys.user_id': 'fbff43f9-d5a4-4e85-b63b-d3a91d806c6f',
         'sys.dialogue_count': 1,
@@ -26,7 +26,7 @@ export const mockedWorkflowProcess = {
       process_data: null,
       outputs: {
         'sys.query': 'hi',
-        'userinput.files': [],
+        'sys.files': [],
         'sys.conversation_id': '92ce0a3e-8f15-43d1-b31d-32716c4b10a7',
         'sys.user_id': 'fbff43f9-d5a4-4e85-b63b-d3a91d806c6f',
         'sys.dialogue_count': 1,

web/app/components/base/prompt-editor/plugins/component-picker-block/__tests__/index.spec.tsx

@@ -494,7 +494,7 @@ describe('ComponentPicker (component-picker-block/index.tsx)', () => {
     expect(dispatchSpy).not.toHaveBeenCalled()
   })
 
-  it('handles workflow variable selection for nested fields: built-in inputs and normal paths', async () => {
+  it('handles workflow variable selection for nested fields: sys.query, sys.files, and normal paths', async () => {
     const captures: Captures = { editor: null, eventEmitter: null }
     const user = userEvent.setup()
 
@@ -503,7 +503,7 @@ describe('ComponentPicker (component-picker-block/index.tsx)', () => {
         makeWorkflowNodeVar('sys.query', VarType.object, [
           makeWorkflowNodeVar('q', VarType.string),
         ]),
-        makeWorkflowNodeVar('userinput.files', VarType.object, [
+        makeWorkflowNodeVar('sys.files', VarType.object, [
           makeWorkflowNodeVar('f', VarType.string),
         ]),
         makeWorkflowNodeVar('output', VarType.object, [makeWorkflowNodeVar('x', VarType.string)]),
@@ -545,10 +545,8 @@ describe('ComponentPicker (component-picker-block/index.tsx)', () => {
     expect(dispatchSpy).toHaveBeenCalledWith(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, ['sys.query'])
     await waitFor(() => expect(readEditorText(editor)).not.toContain('{'))
 
-    await openPickerAndSelectField('userinput.files', 'f')
-    expect(dispatchSpy).toHaveBeenCalledWith(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, [
-      'userinput.files',
-    ])
+    await openPickerAndSelectField('sys.files', 'f')
+    expect(dispatchSpy).toHaveBeenCalledWith(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, ['sys.files'])
     await waitFor(() => expect(readEditorText(editor)).not.toContain('{'))
 
     await openPickerAndSelectField('output', 'x')

web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx

@@ -191,7 +191,6 @@ const ComponentPicker = ({
         if (needRemove) needRemove.remove()
       })
       const isFlat = variables.length === 1
-      const builtInVariable = variables[1]
       if (isFlat) {
         const varName = variables[0]
         if (varName === 'current')
@@ -199,8 +198,8 @@ const ComponentPicker = ({
         else if (varName === 'error_message')
           editor.dispatchCommand(INSERT_ERROR_MESSAGE_BLOCK_COMMAND, null)
         else if (varName === 'last_run') editor.dispatchCommand(INSERT_LAST_RUN_BLOCK_COMMAND, null)
-      } else if (builtInVariable && ['sys.query', 'userinput.files'].includes(builtInVariable)) {
-        editor.dispatchCommand(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, [builtInVariable])
+      } else if (variables[1] === 'sys.query' || variables[1] === 'sys.files') {
+        editor.dispatchCommand(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, [variables[1]])
       } else {
         editor.dispatchCommand(INSERT_WORKFLOW_VARIABLE_BLOCK_COMMAND, variables)
       }

web/app/components/develop/template/template_advanced_chat.en.mdx

@@ -437,7 +437,7 @@ Chat applications support session persistence, allowing previous chat history to
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -481,7 +481,7 @@ Chat applications support session persistence, allowing previous chat history to
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -492,7 +492,7 @@ Chat applications support session persistence, allowing previous chat history to
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -1055,7 +1055,7 @@ Chat applications support session persistence, allowing previous chat history to
     ```streaming {{ title: 'Response' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1067,7 +1067,7 @@ Chat applications support session persistence, allowing previous chat history to
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/develop/template/template_advanced_chat.ja.mdx

@@ -437,7 +437,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -481,7 +481,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -492,7 +492,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -1056,7 +1056,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
     ```streaming {{ title: '応答' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1068,7 +1068,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/develop/template/template_advanced_chat.zh.mdx

@@ -436,7 +436,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -480,7 +480,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -491,7 +491,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -1049,7 +1049,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
     ```streaming {{ title: 'Response' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1061,7 +1061,7 @@ import { WorkflowVersionApiUpgradeNotice } from '../workflow-version-api-upgrade
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/develop/template/template_workflow.en.mdx

@@ -354,7 +354,7 @@ Workflow applications offers non-session support and is ideal for translation, a
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -398,7 +398,7 @@ Workflow applications offers non-session support and is ideal for translation, a
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -409,7 +409,7 @@ Workflow applications offers non-session support and is ideal for translation, a
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -942,7 +942,7 @@ Workflow applications offers non-session support and is ideal for translation, a
         "id": "b1ad3277-089e-42c6-9dff-6820d94fbc76",
         "workflow_id": "19eff89f-ec03-4f75-b0fc-897e7effea02",
         "status": "succeeded",
-        "inputs": "{\"userinput.files\": [], \"sys.user_id\": \"abc-123\"}",
+        "inputs": "{\"sys.files\": [], \"sys.user_id\": \"abc-123\"}",
         "outputs": null,
         "error": null,
         "total_steps": 3,
@@ -1154,7 +1154,7 @@ Workflow applications offers non-session support and is ideal for translation, a
     ```streaming {{ title: 'Response' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1166,7 +1166,7 @@ Workflow applications offers non-session support and is ideal for translation, a
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/develop/template/template_workflow.ja.mdx

@@ -354,7 +354,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -398,7 +398,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -409,7 +409,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -937,7 +937,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
         "id": "b1ad3277-089e-42c6-9dff-6820d94fbc76",
         "workflow_id": "19eff89f-ec03-4f75-b0fc-897e7effea02",
         "status": "succeeded",
-        "inputs": "{\"userinput.files\": [], \"sys.user_id\": \"abc-123\"}",
+        "inputs": "{\"sys.files\": [], \"sys.user_id\": \"abc-123\"}",
         "outputs": null,
         "error": null,
         "total_steps": 3,
@@ -1149,7 +1149,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
     ```streaming {{ title: '応答' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1161,7 +1161,7 @@ import { WorkflowVersionApiContent, WorkflowVersionApiUpgradeNotice } from '../w
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/develop/template/template_workflow.zh.mdx

@@ -344,7 +344,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
         "id": "a4959eb4-c852-4e0c-ac7a-348233f7f345",
         "workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -388,7 +388,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
         "index": 1,
         "predecessor_node_id": null,
         "inputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -399,7 +399,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
         "process_data": {},
         "process_data_truncated": false,
         "outputs": {
-          "userinput.files": [],
+          "sys.files": [],
           "sys.user_id": "abc-123",
           "sys.app_id": "d1074979-f67e-4114-8691-e35878df9a89",
           "sys.workflow_id": "e46514f1-c008-41ff-94b0-4f33d4b97d36",
@@ -930,7 +930,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
         "id": "b1ad3277-089e-42c6-9dff-6820d94fbc76",
         "workflow_id": "19eff89f-ec03-4f75-b0fc-897e7effea02",
         "status": "succeeded",
-        "inputs": "{\"userinput.files\": [], \"sys.user_id\": \"abc-123\"}",
+        "inputs": "{\"sys.files\": [], \"sys.user_id\": \"abc-123\"}",
         "outputs": null,
         "error": null,
         "total_steps": 3,
@@ -1142,7 +1142,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
     ```streaming {{ title: 'Response' }}
     event: ping
 
-    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
+    data: {"event":"workflow_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","sys.timestamp":1776087863},"created_at":1776087863,"reason":"initial"}}
 
     data: {"event":"node_started","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"id":"b552d685-1119-4e6a-9a81-e91a23e5324b","node_id":"1775717266623","node_type":"start","title":"User Input","index":1,"predecessor_node_id":null,"inputs":null,"created_at":1776087863,"extras":{},"iteration_id":null,"loop_id":null}}
 
@@ -1154,7 +1154,7 @@ Workflow 应用无会话支持，适合用于翻译/文章写作/总结 AI 等
 
     data: {"event":"workflow_paused","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","data":{"workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","paused_nodes":["1775717346519"],"outputs":{},"reasons":[{"form_id":"019d8716-0fde-75da-8207-1458ccde76e5","form_content":"this is form 1:\n{{#$output.some_field#}}\n","inputs":[{"type":"paragraph","output_variable_name":"some_field","default":{"type":"variable","selector":["sys","workflow_run_id"],"value":""}}],"actions":[{"id":"approve","title":"YES","button_style":"default"},{"id":"reject","title":"NO","button_style":"default"}],"display_in_ui":true,"node_id":"1775717346519","node_title":"Human Input","resolved_default_values":{"some_field":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"form_token":"n7hFG4ZDYdGcgZ5VDc7EGM","type":"human_input_required"}],"status":"paused","created_at":1776087863,"elapsed_time":0.0,"total_tokens":0,"total_steps":2}}
 
-    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"userinput.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
+    data: {"event":"workflow_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","inputs":{"sys.files":[],"sys.user_id":"abc-123","sys.app_id":"d1074979-f67e-4114-8691-e35878df9a89","sys.workflow_id":"e46514f1-c008-41ff-94b0-4f33d4b97d36","sys.workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c"},"created_at":1776087877,"reason":"resumption"}}
 
     data: {"event":"node_started","workflow_run_id":"5d7ef348-e1c1-4f6d-bb9b-62cc2fb2ef3c","task_id":"1784c3dd-20eb-4919-bd5d-a8d800b74ada","data":{"id":"8d7e8e01-5159-4089-a4b6-3aa394992cc2","node_id":"1775717346519","node_type":"human-input","title":"Human Input","index":1,"predecessor_node_id":null,"inputs":null,"inputs_truncated":false,"created_at":1776087877,"extras":{},"iteration_id":null,"loop_id":null,"agent_strategy":null}}
 

web/app/components/header/account-setting/index.tsx

@@ -211,18 +211,6 @@ export default function AccountSetting({
 
   return (
     <MenuDialog show onClose={handleClose}>
-      <div className="fixed top-6 right-6 z-20 flex shrink-0 flex-col items-center">
-        <Button
-          variant="tertiary"
-          size="large"
-          className="px-2"
-          aria-label={t(($) => $['operation.close'], { ns: 'common' })}
-          onClick={handleClose}
-        >
-          <span className="i-ri-close-line size-5" />
-        </Button>
-        <div className="mt-1 system-2xs-medium-uppercase text-text-tertiary">ESC</div>
-      </div>
       <div className="flex h-screen w-full max-w-full pl-0 sm:pl-[232px]">
         <div className="flex w-[44px] shrink-0 flex-col pr-6 pl-4 sm:w-[224px]">
           <div className="mt-6 mb-8 flex h-[38px] items-center px-3 title-2xl-semi-bold whitespace-nowrap text-text-primary">
@@ -287,6 +275,18 @@ export default function AccountSetting({
                   </div>
                 )}
               </div>
+              <div className="fixed top-6 right-6 flex shrink-0 flex-col items-center">
+                <Button
+                  variant="tertiary"
+                  size="large"
+                  className="px-2"
+                  aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+                  onClick={handleClose}
+                >
+                  <span className="i-ri-close-line size-5" />
+                </Button>
+                <div className="mt-1 system-2xs-medium-uppercase text-text-tertiary">ESC</div>
+              </div>
             </div>
             <div className="max-w-full min-w-0 px-4 pt-6 sm:px-8">
               {activeMenu === ACCOUNT_SETTING_TAB.PROVIDER && (

web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx

@@ -272,10 +272,8 @@ function Popup({
   return (
     <ModelSelectorPopupFrame>
       <ModelSelectorSearchHeader inputValue={inputValue} onInputValueChange={onInputValueChange} />
+      {showCreditsExhaustedAlert && <CreditsExhaustedAlert hasApiKeyFallback={hasApiKeyFallback} />}
       <ModelSelectorScrollBody label={t(($) => $['modelProvider.models'], { ns: 'common' })}>
-        {showCreditsExhaustedAlert && (
-          <CreditsExhaustedAlert hasApiKeyFallback={hasApiKeyFallback} />
-        )}
         <ComboboxList className="max-h-none overflow-visible p-0">
           <div className="pb-1">
             {filteredModelList.map((model) => (

web/app/components/plugins/install-plugin/hooks/__tests__/use-install-plugin-limit.spec.ts

@@ -4,101 +4,125 @@ import { InstallationScope } from '@/features/system-features/constants'
 import { renderHookWithConsoleQuery as renderHook } from '@/test/console/query-data'
 import { pluginInstallLimit } from '../use-install-plugin-limit'
 
-type PluginInstallCandidate = Parameters<typeof pluginInstallLimit>[0]
-type SystemFeatures = Parameters<typeof pluginInstallLimit>[1]
-
 const basePlugin = {
   from: 'marketplace' as const,
   verification: { authorized_category: 'langgenius' },
-} satisfies PluginInstallCandidate
-
-function makeSystemFeatures(
-  scope: PluginInstallationScope,
-  restrictToMarketplaceOnly = false,
-): SystemFeatures {
-  return {
-    plugin_installation_permission: {
-      restrict_to_marketplace_only: restrictToMarketplaceOnly,
-      plugin_installation_scope: scope,
-    },
-  }
 }
 
 describe('pluginInstallLimit', () => {
   it('should allow all plugins when scope is ALL', () => {
-    const features = makeSystemFeatures(InstallationScope.ALL)
-
-    expect(pluginInstallLimit(basePlugin, features).canInstall).toBe(true)
-  })
-
-  it('should deny all plugins when scope is NONE', () => {
-    const features = makeSystemFeatures(InstallationScope.NONE)
-
-    expect(pluginInstallLimit(basePlugin, features).canInstall).toBe(false)
-  })
-
-  it('should allow langgenius plugins when scope is OFFICIAL_ONLY', () => {
-    const features = makeSystemFeatures(InstallationScope.OFFICIAL_ONLY)
-
-    expect(pluginInstallLimit(basePlugin, features).canInstall).toBe(true)
-  })
-
-  it('should deny non-official plugins when scope is OFFICIAL_ONLY', () => {
-    const features = makeSystemFeatures(InstallationScope.OFFICIAL_ONLY)
-    const plugin = {
-      ...basePlugin,
-      verification: { authorized_category: 'community' as const },
-    } satisfies PluginInstallCandidate
-
-    expect(pluginInstallLimit(plugin, features).canInstall).toBe(false)
-  })
-
-  it('should allow partner plugins when scope is OFFICIAL_AND_PARTNER', () => {
-    const features = makeSystemFeatures(InstallationScope.OFFICIAL_AND_PARTNER)
-    const plugin = {
-      ...basePlugin,
-      verification: { authorized_category: 'partner' as const },
-    } satisfies PluginInstallCandidate
-
-    expect(pluginInstallLimit(plugin, features).canInstall).toBe(true)
-  })
-
-  it('should deny github plugins when restrict_to_marketplace_only is true', () => {
-    const features = makeSystemFeatures(InstallationScope.ALL, true)
-    const plugin = { ...basePlugin, from: 'github' as const } satisfies PluginInstallCandidate
-
-    expect(pluginInstallLimit(plugin, features).canInstall).toBe(false)
-  })
-
-  it('should deny package plugins when restrict_to_marketplace_only is true', () => {
-    const features = makeSystemFeatures(InstallationScope.ALL, true)
-    const plugin = { ...basePlugin, from: 'package' as const } satisfies PluginInstallCandidate
-
-    expect(pluginInstallLimit(plugin, features).canInstall).toBe(false)
-  })
-
-  it('should allow marketplace plugins even when restrict_to_marketplace_only is true', () => {
-    const features = makeSystemFeatures(InstallationScope.ALL, true)
-
-    expect(pluginInstallLimit(basePlugin, features).canInstall).toBe(true)
-  })
-
-  it('should default to langgenius when no verification info', () => {
-    const features = makeSystemFeatures(InstallationScope.OFFICIAL_ONLY)
-    const plugin = { from: 'marketplace' as const } satisfies PluginInstallCandidate
-
-    expect(pluginInstallLimit(plugin, features).canInstall).toBe(true)
-  })
-
-  it('should deny installation for an unrecognized runtime scope', () => {
     const features = {
       plugin_installation_permission: {
         restrict_to_marketplace_only: false,
-        plugin_installation_scope: 'unknown-scope',
+        plugin_installation_scope: InstallationScope.ALL,
       },
-    } as unknown as SystemFeatures
+    }
 
-    expect(pluginInstallLimit(basePlugin, features).canInstall).toBe(false)
+    expect(pluginInstallLimit(basePlugin as never, features as never).canInstall).toBe(true)
+  })
+
+  it('should deny all plugins when scope is NONE', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: InstallationScope.NONE,
+      },
+    }
+
+    expect(pluginInstallLimit(basePlugin as never, features as never).canInstall).toBe(false)
+  })
+
+  it('should allow langgenius plugins when scope is OFFICIAL_ONLY', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: InstallationScope.OFFICIAL_ONLY,
+      },
+    }
+
+    expect(pluginInstallLimit(basePlugin as never, features as never).canInstall).toBe(true)
+  })
+
+  it('should deny non-official plugins when scope is OFFICIAL_ONLY', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: InstallationScope.OFFICIAL_ONLY,
+      },
+    }
+    const plugin = { ...basePlugin, verification: { authorized_category: 'community' } }
+
+    expect(pluginInstallLimit(plugin as never, features as never).canInstall).toBe(false)
+  })
+
+  it('should allow partner plugins when scope is OFFICIAL_AND_PARTNER', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: InstallationScope.OFFICIAL_AND_PARTNER,
+      },
+    }
+    const plugin = { ...basePlugin, verification: { authorized_category: 'partner' } }
+
+    expect(pluginInstallLimit(plugin as never, features as never).canInstall).toBe(true)
+  })
+
+  it('should deny github plugins when restrict_to_marketplace_only is true', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: true,
+        plugin_installation_scope: InstallationScope.ALL,
+      },
+    }
+    const plugin = { ...basePlugin, from: 'github' as const }
+
+    expect(pluginInstallLimit(plugin as never, features as never).canInstall).toBe(false)
+  })
+
+  it('should deny package plugins when restrict_to_marketplace_only is true', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: true,
+        plugin_installation_scope: InstallationScope.ALL,
+      },
+    }
+    const plugin = { ...basePlugin, from: 'package' as const }
+
+    expect(pluginInstallLimit(plugin as never, features as never).canInstall).toBe(false)
+  })
+
+  it('should allow marketplace plugins even when restrict_to_marketplace_only is true', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: true,
+        plugin_installation_scope: InstallationScope.ALL,
+      },
+    }
+
+    expect(pluginInstallLimit(basePlugin as never, features as never).canInstall).toBe(true)
+  })
+
+  it('should default to langgenius when no verification info', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: InstallationScope.OFFICIAL_ONLY,
+      },
+    }
+    const plugin = { from: 'marketplace' as const }
+
+    expect(pluginInstallLimit(plugin as never, features as never).canInstall).toBe(true)
+  })
+
+  it('should fallback to canInstall true for unrecognized scope', () => {
+    const features = {
+      plugin_installation_permission: {
+        restrict_to_marketplace_only: false,
+        plugin_installation_scope: 'unknown-scope' as unknown as PluginInstallationScope,
+      },
+    }
+
+    expect(pluginInstallLimit(basePlugin as never, features as never).canInstall).toBe(true)
   })
 })
 
@@ -108,9 +132,9 @@ describe('usePluginInstallLimit', () => {
     const plugin = {
       from: 'marketplace' as const,
       verification: { authorized_category: 'langgenius' },
-    } satisfies PluginInstallCandidate
+    }
 
-    const { result } = renderHook(() => usePluginInstallLimit(plugin))
+    const { result } = renderHook(() => usePluginInstallLimit(plugin as never))
 
     expect(result.current.canInstall).toBe(true)
   })