Merge remote-tracking branch 'origin/main' into feat/source-for-plugin-tasks

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

.github/workflows/main-ci.yml

@@ -63,9 +63,8 @@ jobs:
     if: needs.check-changes.outputs.web-changed == 'true'
     uses: ./.github/workflows/web-tests.yml
     with:
-      base_sha: ${{ github.event.before || github.event.pull_request.base.sha }}
-      diff_range_mode: ${{ github.event.before && 'exact' || 'merge-base' }}
-      head_sha: ${{ github.event.after || github.event.pull_request.head.sha || github.sha }}
+      base_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.sha || github.event.before }}
+      head_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
   style-check:
     name: Style Check

.github/workflows/web-tests.yml

@@ -6,9 +6,6 @@ on:
       base_sha:
         required: false
         type: string
-      diff_range_mode:
-        required: false
-        type: string
       head_sha:
         required: false
         type: string
@@ -89,24 +86,13 @@ jobs:
       - name: Merge reports
         run: vp test --merge-reports --reporter=json --reporter=agent --coverage
 
-      - name: Report app/components baseline coverage
-        run: node ./scripts/report-components-coverage-baseline.mjs
-
-      - name: Report app/components test touch
+      - name: Check app/components diff coverage
         env:
           BASE_SHA: ${{ inputs.base_sha }}
-          DIFF_RANGE_MODE: ${{ inputs.diff_range_mode }}
-          HEAD_SHA: ${{ inputs.head_sha }}
-        run: node ./scripts/report-components-test-touch.mjs
-
-      - name: Check app/components pure diff coverage
-        env:
-          BASE_SHA: ${{ inputs.base_sha }}
-          DIFF_RANGE_MODE: ${{ inputs.diff_range_mode }}
           HEAD_SHA: ${{ inputs.head_sha }}
         run: node ./scripts/check-components-diff-coverage.mjs
 
-      - name: Check Coverage Summary
+      - name: Coverage Summary
         if: always()
         id: coverage-summary
         run: |
@@ -115,15 +101,313 @@ jobs:
           COVERAGE_FILE="coverage/coverage-final.json"
           COVERAGE_SUMMARY_FILE="coverage/coverage-summary.json"
 
-          if [ -f "$COVERAGE_FILE" ] || [ -f "$COVERAGE_SUMMARY_FILE" ]; then
-            echo "has_coverage=true" >> "$GITHUB_OUTPUT"
+          if [ ! -f "$COVERAGE_FILE" ] && [ ! -f "$COVERAGE_SUMMARY_FILE" ]; then
+            echo "has_coverage=false" >> "$GITHUB_OUTPUT"
+            echo "### 🚨 Test Coverage Report :test_tube:" >> "$GITHUB_STEP_SUMMARY"
+            echo "Coverage data not found. Ensure Vitest runs with coverage enabled." >> "$GITHUB_STEP_SUMMARY"
             exit 0
           fi
 
-          echo "has_coverage=false" >> "$GITHUB_OUTPUT"
-          echo "### 🚨 app/components Diff Coverage" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "Coverage artifacts not found. Ensure Vitest merge reports ran with coverage enabled." >> "$GITHUB_STEP_SUMMARY"
+          echo "has_coverage=true" >> "$GITHUB_OUTPUT"
+
+          node <<'NODE' >> "$GITHUB_STEP_SUMMARY"
+          const fs = require('fs');
+          const path = require('path');
+          let libCoverage = null;
+
+          try {
+            libCoverage = require('istanbul-lib-coverage');
+          } catch (error) {
+            libCoverage = null;
+          }
+
+          const summaryPath = path.join('coverage', 'coverage-summary.json');
+          const finalPath = path.join('coverage', 'coverage-final.json');
+
+          const hasSummary = fs.existsSync(summaryPath);
+          const hasFinal = fs.existsSync(finalPath);
+
+          if (!hasSummary && !hasFinal) {
+            console.log('### Test Coverage Summary :test_tube:');
+            console.log('');
+            console.log('No coverage data found.');
+            process.exit(0);
+          }
+
+          const summary = hasSummary
+            ? JSON.parse(fs.readFileSync(summaryPath, 'utf8'))
+            : null;
+          const coverage = hasFinal
+            ? JSON.parse(fs.readFileSync(finalPath, 'utf8'))
+            : null;
+
+          const getLineCoverageFromStatements = (statementMap, statementHits) => {
+            const lineHits = {};
+
+            if (!statementMap || !statementHits) {
+              return lineHits;
+            }
+
+            Object.entries(statementMap).forEach(([key, statement]) => {
+              const line = statement?.start?.line;
+              if (!line) {
+                return;
+              }
+              const hits = statementHits[key] ?? 0;
+              const previous = lineHits[line];
+              lineHits[line] = previous === undefined ? hits : Math.max(previous, hits);
+            });
+
+            return lineHits;
+          };
+
+          const getFileCoverage = (entry) => (
+            libCoverage ? libCoverage.createFileCoverage(entry) : null
+          );
+
+          const getLineHits = (entry, fileCoverage) => {
+            const lineHits = entry.l ?? {};
+            if (Object.keys(lineHits).length > 0) {
+              return lineHits;
+            }
+            if (fileCoverage) {
+              return fileCoverage.getLineCoverage();
+            }
+            return getLineCoverageFromStatements(entry.statementMap ?? {}, entry.s ?? {});
+          };
+
+          const getUncoveredLines = (entry, fileCoverage, lineHits) => {
+            if (lineHits && Object.keys(lineHits).length > 0) {
+              return Object.entries(lineHits)
+                .filter(([, count]) => count === 0)
+                .map(([line]) => Number(line))
+                .sort((a, b) => a - b);
+            }
+            if (fileCoverage) {
+              return fileCoverage.getUncoveredLines();
+            }
+            return [];
+          };
+
+          const totals = {
+            lines: { covered: 0, total: 0 },
+            statements: { covered: 0, total: 0 },
+            branches: { covered: 0, total: 0 },
+            functions: { covered: 0, total: 0 },
+          };
+          const fileSummaries = [];
+
+          if (summary) {
+            const totalEntry = summary.total ?? {};
+            ['lines', 'statements', 'branches', 'functions'].forEach((key) => {
+              if (totalEntry[key]) {
+                totals[key].covered = totalEntry[key].covered ?? 0;
+                totals[key].total = totalEntry[key].total ?? 0;
+              }
+            });
+
+            Object.entries(summary)
+              .filter(([file]) => file !== 'total')
+              .forEach(([file, data]) => {
+                fileSummaries.push({
+                  file,
+                  pct: data.lines?.pct ?? data.statements?.pct ?? 0,
+                  lines: {
+                    covered: data.lines?.covered ?? 0,
+                    total: data.lines?.total ?? 0,
+                  },
+                });
+              });
+          } else if (coverage) {
+            Object.entries(coverage).forEach(([file, entry]) => {
+              const fileCoverage = getFileCoverage(entry);
+              const lineHits = getLineHits(entry, fileCoverage);
+              const statementHits = entry.s ?? {};
+              const branchHits = entry.b ?? {};
+              const functionHits = entry.f ?? {};
+
+              const lineTotal = Object.keys(lineHits).length;
+              const lineCovered = Object.values(lineHits).filter((n) => n > 0).length;
+
+              const statementTotal = Object.keys(statementHits).length;
+              const statementCovered = Object.values(statementHits).filter((n) => n > 0).length;
+
+              const branchTotal = Object.values(branchHits).reduce((acc, branches) => acc + branches.length, 0);
+              const branchCovered = Object.values(branchHits).reduce(
+                (acc, branches) => acc + branches.filter((n) => n > 0).length,
+                0,
+              );
+
+              const functionTotal = Object.keys(functionHits).length;
+              const functionCovered = Object.values(functionHits).filter((n) => n > 0).length;
+
+              totals.lines.total += lineTotal;
+              totals.lines.covered += lineCovered;
+              totals.statements.total += statementTotal;
+              totals.statements.covered += statementCovered;
+              totals.branches.total += branchTotal;
+              totals.branches.covered += branchCovered;
+              totals.functions.total += functionTotal;
+              totals.functions.covered += functionCovered;
+
+              const pct = (covered, tot) => (tot > 0 ? (covered / tot) * 100 : 0);
+
+              fileSummaries.push({
+                file,
+                pct: pct(lineCovered || statementCovered, lineTotal || statementTotal),
+                lines: {
+                  covered: lineCovered || statementCovered,
+                  total: lineTotal || statementTotal,
+                },
+              });
+            });
+          }
+
+          const pct = (covered, tot) => (tot > 0 ? ((covered / tot) * 100).toFixed(2) : '0.00');
+
+          console.log('### Test Coverage Summary :test_tube:');
+          console.log('');
+          console.log('| Metric | Coverage | Covered / Total |');
+          console.log('|--------|----------|-----------------|');
+          console.log(`| Lines | ${pct(totals.lines.covered, totals.lines.total)}% | ${totals.lines.covered} / ${totals.lines.total} |`);
+          console.log(`| Statements | ${pct(totals.statements.covered, totals.statements.total)}% | ${totals.statements.covered} / ${totals.statements.total} |`);
+          console.log(`| Branches | ${pct(totals.branches.covered, totals.branches.total)}% | ${totals.branches.covered} / ${totals.branches.total} |`);
+          console.log(`| Functions | ${pct(totals.functions.covered, totals.functions.total)}% | ${totals.functions.covered} / ${totals.functions.total} |`);
+
+          console.log('');
+          console.log('<details><summary>File coverage (lowest lines first)</summary>');
+          console.log('');
+          console.log('```');
+          fileSummaries
+            .sort((a, b) => (a.pct - b.pct) || (b.lines.total - a.lines.total))
+            .slice(0, 25)
+            .forEach(({ file, pct, lines }) => {
+              console.log(`${pct.toFixed(2)}%\t${lines.covered}/${lines.total}\t${file}`);
+            });
+          console.log('```');
+          console.log('</details>');
+
+          if (coverage) {
+            const pctValue = (covered, tot) => {
+              if (tot === 0) {
+                return '0';
+              }
+              return ((covered / tot) * 100)
+                .toFixed(2)
+                .replace(/\.?0+$/, '');
+            };
+
+            const formatLineRanges = (lines) => {
+              if (lines.length === 0) {
+                return '';
+              }
+              const ranges = [];
+              let start = lines[0];
+              let end = lines[0];
+
+              for (let i = 1; i < lines.length; i += 1) {
+                const current = lines[i];
+                if (current === end + 1) {
+                  end = current;
+                  continue;
+                }
+                ranges.push(start === end ? `${start}` : `${start}-${end}`);
+                start = current;
+                end = current;
+              }
+              ranges.push(start === end ? `${start}` : `${start}-${end}`);
+              return ranges.join(',');
+            };
+
+            const tableTotals = {
+              statements: { covered: 0, total: 0 },
+              branches: { covered: 0, total: 0 },
+              functions: { covered: 0, total: 0 },
+              lines: { covered: 0, total: 0 },
+            };
+            const tableRows = Object.entries(coverage)
+              .map(([file, entry]) => {
+                const fileCoverage = getFileCoverage(entry);
+                const lineHits = getLineHits(entry, fileCoverage);
+                const statementHits = entry.s ?? {};
+                const branchHits = entry.b ?? {};
+                const functionHits = entry.f ?? {};
+
+                const lineTotal = Object.keys(lineHits).length;
+                const lineCovered = Object.values(lineHits).filter((n) => n > 0).length;
+                const statementTotal = Object.keys(statementHits).length;
+                const statementCovered = Object.values(statementHits).filter((n) => n > 0).length;
+                const branchTotal = Object.values(branchHits).reduce((acc, branches) => acc + branches.length, 0);
+                const branchCovered = Object.values(branchHits).reduce(
+                  (acc, branches) => acc + branches.filter((n) => n > 0).length,
+                  0,
+                );
+                const functionTotal = Object.keys(functionHits).length;
+                const functionCovered = Object.values(functionHits).filter((n) => n > 0).length;
+
+                tableTotals.lines.total += lineTotal;
+                tableTotals.lines.covered += lineCovered;
+                tableTotals.statements.total += statementTotal;
+                tableTotals.statements.covered += statementCovered;
+                tableTotals.branches.total += branchTotal;
+                tableTotals.branches.covered += branchCovered;
+                tableTotals.functions.total += functionTotal;
+                tableTotals.functions.covered += functionCovered;
+
+                const uncoveredLines = getUncoveredLines(entry, fileCoverage, lineHits);
+
+                const filePath = entry.path ?? file;
+                const relativePath = path.isAbsolute(filePath)
+                  ? path.relative(process.cwd(), filePath)
+                  : filePath;
+
+                return {
+                  file: relativePath || file,
+                  statements: pctValue(statementCovered, statementTotal),
+                  branches: pctValue(branchCovered, branchTotal),
+                  functions: pctValue(functionCovered, functionTotal),
+                  lines: pctValue(lineCovered, lineTotal),
+                  uncovered: formatLineRanges(uncoveredLines),
+                };
+              })
+              .sort((a, b) => a.file.localeCompare(b.file));
+
+            const columns = [
+              { key: 'file', header: 'File', align: 'left' },
+              { key: 'statements', header: '% Stmts', align: 'right' },
+              { key: 'branches', header: '% Branch', align: 'right' },
+              { key: 'functions', header: '% Funcs', align: 'right' },
+              { key: 'lines', header: '% Lines', align: 'right' },
+              { key: 'uncovered', header: 'Uncovered Line #s', align: 'left' },
+            ];
+
+            const allFilesRow = {
+              file: 'All files',
+              statements: pctValue(tableTotals.statements.covered, tableTotals.statements.total),
+              branches: pctValue(tableTotals.branches.covered, tableTotals.branches.total),
+              functions: pctValue(tableTotals.functions.covered, tableTotals.functions.total),
+              lines: pctValue(tableTotals.lines.covered, tableTotals.lines.total),
+              uncovered: '',
+            };
+
+            const rowsForOutput = [allFilesRow, ...tableRows];
+            const formatRow = (row) => `| ${columns
+              .map(({ key }) => String(row[key] ?? ''))
+              .join(' | ')} |`;
+            const headerRow = `| ${columns.map(({ header }) => header).join(' | ')} |`;
+            const dividerRow = `| ${columns
+              .map(({ align }) => (align === 'right' ? '---:' : ':---'))
+              .join(' | ')} |`;
+
+            console.log('');
+            console.log('<details><summary>Vitest coverage table</summary>');
+            console.log('');
+            console.log(headerRow);
+            console.log(dividerRow);
+            rowsForOutput.forEach((row) => console.log(formatRow(row)));
+            console.log('</details>');
+          }
+          NODE
 
       - name: Upload Coverage Artifact
         if: steps.coverage-summary.outputs.has_coverage == 'true'

api/.env.example

@@ -737,25 +737,24 @@ SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30
 SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL=90000
 
 
-# Redis URL used for event bus between API and
+# Redis URL used for PubSub between API and
 # celery worker
 # defaults to url constructed from `REDIS_*`
 # configurations
-EVENT_BUS_REDIS_URL=
-# Event transport type. Options are:
+PUBSUB_REDIS_URL=
+# Pub/sub channel type for streaming events.
+# valid options are:
 #
-#  - pubsub: normal Pub/Sub (at-most-once)
-#  - sharded: sharded Pub/Sub (at-most-once)
-#  - streams: Redis Streams (at-least-once, recommended to avoid subscriber races)
+# - pubsub: for normal Pub/Sub
+# - sharded: for sharded Pub/Sub
 #
-# Note: Before enabling 'streams' in production, estimate your expected event volume and retention needs.
-# Configure Redis memory limits and stream trimming appropriately (e.g., MAXLEN and key expiry) to reduce
-# the risk of data loss from Redis auto-eviction under memory pressure.
-# Also accepts ENV: EVENT_BUS_REDIS_CHANNEL_TYPE.
-EVENT_BUS_REDIS_CHANNEL_TYPE=pubsub
-# Whether to use Redis cluster mode while use redis as event bus.
+# It's highly recommended to use sharded Pub/Sub AND redis cluster
+# for large deployments.
+PUBSUB_REDIS_CHANNEL_TYPE=pubsub
+# Whether to use Redis cluster mode while running
+# PubSub.
 #  It's highly recommended to enable this for large deployments.
-EVENT_BUS_REDIS_USE_CLUSTERS=false
+PUBSUB_REDIS_USE_CLUSTERS=false
 
 # Whether to Enable human input timeout check task
 ENABLE_HUMAN_INPUT_TIMEOUT_TASK=true

api/AGENTS.md

@@ -78,7 +78,7 @@ class UserProfile(TypedDict):
     nickname: NotRequired[str]
 ```
 
-- For classes, declare all member variables explicitly with types at the top of the class body (before `__init__`), even when the class is not a dataclass or Pydantic model, so the class shape is obvious at a glance:
+- For classes, declare member variables at the top of the class body (before `__init__`) so the class shape is obvious at a glance:
 
 ```python
 from datetime import datetime

api/commands/retention.py

@@ -88,8 +88,6 @@ def clean_workflow_runs(
     """
     Clean workflow runs and related workflow data for free tenants.
     """
-    from extensions.otel.runtime import flush_telemetry
-
     if (start_from is None) ^ (end_before is None):
         raise click.UsageError("--start-from and --end-before must be provided together.")
 
@@ -106,27 +104,16 @@ def clean_workflow_runs(
         end_before = now - datetime.timedelta(days=to_days_ago)
         before_days = 0
 
-    if from_days_ago is not None and to_days_ago is not None:
-        task_label = f"{from_days_ago}to{to_days_ago}"
-    elif start_from is None:
-        task_label = f"before-{before_days}"
-    else:
-        task_label = "custom"
-
     start_time = datetime.datetime.now(datetime.UTC)
     click.echo(click.style(f"Starting workflow run cleanup at {start_time.isoformat()}.", fg="white"))
 
-    try:
-        WorkflowRunCleanup(
-            days=before_days,
-            batch_size=batch_size,
-            start_from=start_from,
-            end_before=end_before,
-            dry_run=dry_run,
-            task_label=task_label,
-        ).run()
-    finally:
-        flush_telemetry()
+    WorkflowRunCleanup(
+        days=before_days,
+        batch_size=batch_size,
+        start_from=start_from,
+        end_before=end_before,
+        dry_run=dry_run,
+    ).run()
 
     end_time = datetime.datetime.now(datetime.UTC)
     elapsed = end_time - start_time
@@ -672,8 +659,6 @@ def clean_expired_messages(
     """
     Clean expired messages and related data for tenants based on clean policy.
     """
-    from extensions.otel.runtime import flush_telemetry
-
     click.echo(click.style("clean_messages: start clean messages.", fg="green"))
 
     start_at = time.perf_counter()
@@ -713,13 +698,6 @@ def clean_expired_messages(
         # NOTE: graceful_period will be ignored when billing is disabled.
         policy = create_message_clean_policy(graceful_period_days=graceful_period)
 
-        if from_days_ago is not None and before_days is not None:
-            task_label = f"{from_days_ago}to{before_days}"
-        elif start_from is None and before_days is not None:
-            task_label = f"before-{before_days}"
-        else:
-            task_label = "custom"
-
         # Create and run the cleanup service
         if abs_mode:
             assert start_from is not None
@@ -730,7 +708,6 @@ def clean_expired_messages(
                 end_before=end_before,
                 batch_size=batch_size,
                 dry_run=dry_run,
-                task_label=task_label,
             )
         elif from_days_ago is None:
             assert before_days is not None
@@ -739,7 +716,6 @@ def clean_expired_messages(
                 days=before_days,
                 batch_size=batch_size,
                 dry_run=dry_run,
-                task_label=task_label,
             )
         else:
             assert before_days is not None
@@ -751,7 +727,6 @@ def clean_expired_messages(
                 end_before=now - datetime.timedelta(days=before_days),
                 batch_size=batch_size,
                 dry_run=dry_run,
-                task_label=task_label,
             )
         stats = service.run()
 
@@ -777,8 +752,6 @@ def clean_expired_messages(
             )
         )
         raise
-    finally:
-        flush_telemetry()
 
     click.echo(click.style("messages cleanup completed.", fg="green"))
 

api/configs/middleware/cache/redis_config.py

@@ -1,4 +1,4 @@
-from pydantic import Field, NonNegativeInt, PositiveFloat, PositiveInt, field_validator
+from pydantic import Field, NonNegativeInt, PositiveFloat, PositiveInt
 from pydantic_settings import BaseSettings
 
 
@@ -116,13 +116,3 @@ class RedisConfig(BaseSettings):
         description="Maximum connections in the Redis connection pool (unset for library default)",
         default=None,
     )
-
-    @field_validator("REDIS_MAX_CONNECTIONS", mode="before")
-    @classmethod
-    def _empty_string_to_none_for_max_conns(cls, v):
-        """Allow empty string in env/.env to mean 'unset' (None)."""
-        if v is None:
-            return None
-        if isinstance(v, str) and v.strip() == "":
-            return None
-        return v

api/configs/middleware/cache/redis_pubsub_config.py

@@ -1,4 +1,4 @@
-from typing import Literal, Protocol, cast
+from typing import Literal, Protocol
 from urllib.parse import quote_plus, urlunparse
 
 from pydantic import AliasChoices, Field
@@ -12,13 +12,16 @@ class RedisConfigDefaults(Protocol):
     REDIS_PASSWORD: str | None
     REDIS_DB: int
     REDIS_USE_SSL: bool
+    REDIS_USE_SENTINEL: bool | None
+    REDIS_USE_CLUSTERS: bool
 
 
-def _redis_defaults(config: object) -> RedisConfigDefaults:
-    return cast(RedisConfigDefaults, config)
+class RedisConfigDefaultsMixin:
+    def _redis_defaults(self: RedisConfigDefaults) -> RedisConfigDefaults:
+        return self
 
 
-class RedisPubSubConfig(BaseSettings):
+class RedisPubSubConfig(BaseSettings, RedisConfigDefaultsMixin):
     """
     Configuration settings for event transport between API and workers.
 
@@ -38,10 +41,10 @@ class RedisPubSubConfig(BaseSettings):
     )
 
     PUBSUB_REDIS_USE_CLUSTERS: bool = Field(
-        validation_alias=AliasChoices("EVENT_BUS_REDIS_USE_CLUSTERS", "PUBSUB_REDIS_USE_CLUSTERS"),
+        validation_alias=AliasChoices("EVENT_BUS_REDIS_CLUSTERS", "PUBSUB_REDIS_USE_CLUSTERS"),
         description=(
             "Enable Redis Cluster mode for pub/sub or streams transport. Recommended for large deployments. "
-            "Also accepts ENV: EVENT_BUS_REDIS_USE_CLUSTERS."
+            "Also accepts ENV: EVENT_BUS_REDIS_CLUSTERS."
         ),
         default=False,
     )
@@ -71,7 +74,7 @@ class RedisPubSubConfig(BaseSettings):
     )
 
     def _build_default_pubsub_url(self) -> str:
-        defaults = _redis_defaults(self)
+        defaults = self._redis_defaults()
         if not defaults.REDIS_HOST or not defaults.REDIS_PORT:
             raise ValueError("PUBSUB_REDIS_URL must be set when default Redis URL cannot be constructed")
 
@@ -88,9 +91,11 @@ class RedisPubSubConfig(BaseSettings):
         if userinfo:
             userinfo = f"{userinfo}@"
 
+        host = defaults.REDIS_HOST
+        port = defaults.REDIS_PORT
         db = defaults.REDIS_DB
 
-        netloc = f"{userinfo}{defaults.REDIS_HOST}:{defaults.REDIS_PORT}"
+        netloc = f"{userinfo}{host}:{port}"
         return urlunparse((scheme, netloc, f"/{db}", "", "", ""))
 
     @property

api/controllers/console/app/workflow_draft_variable.py

@@ -23,7 +23,7 @@ from dify_graph.variables.types import SegmentType
 from extensions.ext_database import db
 from factories.file_factory import build_from_mapping, build_from_mappings
 from factories.variable_factory import build_segment_with_type
-from libs.login import current_user, login_required
+from libs.login import login_required
 from models import App, AppMode
 from models.workflow import WorkflowDraftVariable
 from services.workflow_draft_variable_service import WorkflowDraftVariableList, WorkflowDraftVariableService
@@ -100,18 +100,6 @@ def _serialize_full_content(variable: WorkflowDraftVariable) -> dict | None:
     }
 
 
-def _ensure_variable_access(
-    variable: WorkflowDraftVariable | None,
-    app_id: str,
-    variable_id: str,
-) -> WorkflowDraftVariable:
-    if variable is None:
-        raise NotFoundError(description=f"variable not found, id={variable_id}")
-    if variable.app_id != app_id or variable.user_id != current_user.id:
-        raise NotFoundError(description=f"variable not found, id={variable_id}")
-    return variable
-
-
 _WORKFLOW_DRAFT_VARIABLE_WITHOUT_VALUE_FIELDS = {
     "id": fields.String,
     "type": fields.String(attribute=lambda model: model.get_variable_type()),
@@ -250,7 +238,6 @@ class WorkflowVariableCollectionApi(Resource):
                 app_id=app_model.id,
                 page=args.page,
                 limit=args.limit,
-                user_id=current_user.id,
             )
 
         return workflow_vars
@@ -263,7 +250,7 @@ class WorkflowVariableCollectionApi(Resource):
         draft_var_srv = WorkflowDraftVariableService(
             session=db.session(),
         )
-        draft_var_srv.delete_user_workflow_variables(app_model.id, user_id=current_user.id)
+        draft_var_srv.delete_workflow_variables(app_model.id)
         db.session.commit()
         return Response("", 204)
 
@@ -300,7 +287,7 @@ class NodeVariableCollectionApi(Resource):
             draft_var_srv = WorkflowDraftVariableService(
                 session=session,
             )
-            node_vars = draft_var_srv.list_node_variables(app_model.id, node_id, user_id=current_user.id)
+            node_vars = draft_var_srv.list_node_variables(app_model.id, node_id)
 
         return node_vars
 
@@ -311,7 +298,7 @@ class NodeVariableCollectionApi(Resource):
     def delete(self, app_model: App, node_id: str):
         validate_node_id(node_id)
         srv = WorkflowDraftVariableService(db.session())
-        srv.delete_node_variables(app_model.id, node_id, user_id=current_user.id)
+        srv.delete_node_variables(app_model.id, node_id)
         db.session.commit()
         return Response("", 204)
 
@@ -332,11 +319,11 @@ class VariableApi(Resource):
         draft_var_srv = WorkflowDraftVariableService(
             session=db.session(),
         )
-        variable = _ensure_variable_access(
-            variable=draft_var_srv.get_variable(variable_id=variable_id),
-            app_id=app_model.id,
-            variable_id=variable_id,
-        )
+        variable = draft_var_srv.get_variable(variable_id=variable_id)
+        if variable is None:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
+        if variable.app_id != app_model.id:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
         return variable
 
     @console_ns.doc("update_variable")
@@ -373,11 +360,11 @@ class VariableApi(Resource):
         )
         args_model = WorkflowDraftVariableUpdatePayload.model_validate(console_ns.payload or {})
 
-        variable = _ensure_variable_access(
-            variable=draft_var_srv.get_variable(variable_id=variable_id),
-            app_id=app_model.id,
-            variable_id=variable_id,
-        )
+        variable = draft_var_srv.get_variable(variable_id=variable_id)
+        if variable is None:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
+        if variable.app_id != app_model.id:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
 
         new_name = args_model.name
         raw_value = args_model.value
@@ -410,11 +397,11 @@ class VariableApi(Resource):
         draft_var_srv = WorkflowDraftVariableService(
             session=db.session(),
         )
-        variable = _ensure_variable_access(
-            variable=draft_var_srv.get_variable(variable_id=variable_id),
-            app_id=app_model.id,
-            variable_id=variable_id,
-        )
+        variable = draft_var_srv.get_variable(variable_id=variable_id)
+        if variable is None:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
+        if variable.app_id != app_model.id:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
         draft_var_srv.delete_variable(variable)
         db.session.commit()
         return Response("", 204)
@@ -440,11 +427,11 @@ class VariableResetApi(Resource):
             raise NotFoundError(
                 f"Draft workflow not found, app_id={app_model.id}",
             )
-        variable = _ensure_variable_access(
-            variable=draft_var_srv.get_variable(variable_id=variable_id),
-            app_id=app_model.id,
-            variable_id=variable_id,
-        )
+        variable = draft_var_srv.get_variable(variable_id=variable_id)
+        if variable is None:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
+        if variable.app_id != app_model.id:
+            raise NotFoundError(description=f"variable not found, id={variable_id}")
 
         resetted = draft_var_srv.reset_variable(draft_workflow, variable)
         db.session.commit()
@@ -460,15 +447,11 @@ def _get_variable_list(app_model: App, node_id) -> WorkflowDraftVariableList:
             session=session,
         )
         if node_id == CONVERSATION_VARIABLE_NODE_ID:
-            draft_vars = draft_var_srv.list_conversation_variables(app_model.id, user_id=current_user.id)
+            draft_vars = draft_var_srv.list_conversation_variables(app_model.id)
         elif node_id == SYSTEM_VARIABLE_NODE_ID:
-            draft_vars = draft_var_srv.list_system_variables(app_model.id, user_id=current_user.id)
+            draft_vars = draft_var_srv.list_system_variables(app_model.id)
         else:
-            draft_vars = draft_var_srv.list_node_variables(
-                app_id=app_model.id,
-                node_id=node_id,
-                user_id=current_user.id,
-            )
+            draft_vars = draft_var_srv.list_node_variables(app_id=app_model.id, node_id=node_id)
     return draft_vars
 
 
@@ -489,7 +472,7 @@ class ConversationVariableCollectionApi(Resource):
         if draft_workflow is None:
             raise NotFoundError(description=f"draft workflow not found, id={app_model.id}")
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(draft_workflow, user_id=current_user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(draft_workflow)
         db.session.commit()
         return _get_variable_list(app_model, CONVERSATION_VARIABLE_NODE_ID)
 

api/controllers/console/datasets/rag_pipeline/rag_pipeline_draft_variable.py

@@ -102,7 +102,6 @@ class RagPipelineVariableCollectionApi(Resource):
             app_id=pipeline.id,
             page=query.page,
             limit=query.limit,
-            user_id=current_user.id,
         )
 
         return workflow_vars
@@ -112,7 +111,7 @@ class RagPipelineVariableCollectionApi(Resource):
         draft_var_srv = WorkflowDraftVariableService(
             session=db.session(),
         )
-        draft_var_srv.delete_user_workflow_variables(pipeline.id, user_id=current_user.id)
+        draft_var_srv.delete_workflow_variables(pipeline.id)
         db.session.commit()
         return Response("", 204)
 
@@ -145,7 +144,7 @@ class RagPipelineNodeVariableCollectionApi(Resource):
             draft_var_srv = WorkflowDraftVariableService(
                 session=session,
             )
-            node_vars = draft_var_srv.list_node_variables(pipeline.id, node_id, user_id=current_user.id)
+            node_vars = draft_var_srv.list_node_variables(pipeline.id, node_id)
 
         return node_vars
 
@@ -153,7 +152,7 @@ class RagPipelineNodeVariableCollectionApi(Resource):
     def delete(self, pipeline: Pipeline, node_id: str):
         validate_node_id(node_id)
         srv = WorkflowDraftVariableService(db.session())
-        srv.delete_node_variables(pipeline.id, node_id, user_id=current_user.id)
+        srv.delete_node_variables(pipeline.id, node_id)
         db.session.commit()
         return Response("", 204)
 
@@ -284,11 +283,11 @@ def _get_variable_list(pipeline: Pipeline, node_id) -> WorkflowDraftVariableList
             session=session,
         )
         if node_id == CONVERSATION_VARIABLE_NODE_ID:
-            draft_vars = draft_var_srv.list_conversation_variables(pipeline.id, user_id=current_user.id)
+            draft_vars = draft_var_srv.list_conversation_variables(pipeline.id)
         elif node_id == SYSTEM_VARIABLE_NODE_ID:
-            draft_vars = draft_var_srv.list_system_variables(pipeline.id, user_id=current_user.id)
+            draft_vars = draft_var_srv.list_system_variables(pipeline.id)
         else:
-            draft_vars = draft_var_srv.list_node_variables(app_id=pipeline.id, node_id=node_id, user_id=current_user.id)
+            draft_vars = draft_var_srv.list_node_variables(app_id=pipeline.id, node_id=node_id)
     return draft_vars
 
 

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

@@ -330,10 +330,9 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
 
         return self._generate(
             workflow=workflow,
@@ -414,10 +413,9 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
 
         return self._generate(
             workflow=workflow,

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

@@ -419,12 +419,11 @@ class PipelineGenerator(BaseAppGenerator):
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
         var_loader = DraftVarLoader(
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
 
         return self._generate(
@@ -515,12 +514,11 @@ class PipelineGenerator(BaseAppGenerator):
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
         var_loader = DraftVarLoader(
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
 
         return self._generate(

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

@@ -414,12 +414,11 @@ class WorkflowAppGenerator(BaseAppGenerator):
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
         var_loader = DraftVarLoader(
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
 
         return self._generate(
@@ -498,12 +497,11 @@ class WorkflowAppGenerator(BaseAppGenerator):
             triggered_from=WorkflowNodeExecutionTriggeredFrom.SINGLE_STEP,
         )
         draft_var_srv = WorkflowDraftVariableService(db.session())
-        draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user.id)
+        draft_var_srv.prefill_conversation_variable_default_values(workflow)
         var_loader = DraftVarLoader(
             engine=db.engine,
             app_id=application_generate_entity.app_config.app_id,
             tenant_id=application_generate_entity.app_config.tenant_id,
-            user_id=user.id,
         )
         return self._generate(
             app_model=app_model,

api/core/entities/provider_configuration.py

@@ -473,21 +473,9 @@ class ProviderConfiguration(BaseModel):
 
                     self.switch_preferred_provider_type(provider_type=ProviderType.CUSTOM, session=session)
                 else:
+                    # some historical data may have a provider record but not be set as valid
                     provider_record.is_valid = True
 
-                    if provider_record.credential_id is None:
-                        provider_record.credential_id = new_record.id
-                        provider_record.updated_at = naive_utc_now()
-
-                        provider_model_credentials_cache = ProviderCredentialsCache(
-                            tenant_id=self.tenant_id,
-                            identity_id=provider_record.id,
-                            cache_type=ProviderCredentialsCacheType.PROVIDER,
-                        )
-                        provider_model_credentials_cache.delete()
-
-                        self.switch_preferred_provider_type(provider_type=ProviderType.CUSTOM, session=session)
-
                 session.commit()
             except Exception:
                 session.rollback()

api/core/indexing_runner.py

@@ -5,7 +5,6 @@ import re
 import threading
 import time
 import uuid
-from collections.abc import Mapping
 from typing import Any
 
 from flask import Flask, current_app
@@ -38,7 +37,7 @@ from extensions.ext_storage import storage
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from models import Account
-from models.dataset import AutomaticRulesConfig, ChildChunk, Dataset, DatasetProcessRule, DocumentSegment
+from models.dataset import ChildChunk, Dataset, DatasetProcessRule, DocumentSegment
 from models.dataset import Document as DatasetDocument
 from models.model import UploadFile
 from services.feature_service import FeatureService
@@ -266,7 +265,7 @@ class IndexingRunner:
         self,
         tenant_id: str,
         extract_settings: list[ExtractSetting],
-        tmp_processing_rule: Mapping[str, Any],
+        tmp_processing_rule: dict,
         doc_form: str | None = None,
         doc_language: str = "English",
         dataset_id: str | None = None,
@@ -377,7 +376,7 @@ class IndexingRunner:
         return IndexingEstimate(total_segments=total_segments, preview=preview_texts)
 
     def _extract(
-        self, index_processor: BaseIndexProcessor, dataset_document: DatasetDocument, process_rule: Mapping[str, Any]
+        self, index_processor: BaseIndexProcessor, dataset_document: DatasetDocument, process_rule: dict
     ) -> list[Document]:
         data_source_info = dataset_document.data_source_info_dict
         text_docs = []
@@ -544,7 +543,6 @@ class IndexingRunner:
         """
         Clean the document text according to the processing rules.
         """
-        rules: AutomaticRulesConfig | dict[str, Any]
         if processing_rule.mode == "automatic":
             rules = DatasetProcessRule.AUTOMATIC_RULES
         else:
@@ -758,7 +756,7 @@ class IndexingRunner:
         dataset: Dataset,
         text_docs: list[Document],
         doc_language: str,
-        process_rule: Mapping[str, Any],
+        process_rule: dict,
         current_user: Account | None = None,
     ) -> list[Document]:
         # get embedding model instance

api/core/mcp/auth/auth_flow.py

@@ -55,31 +55,15 @@ def build_protected_resource_metadata_discovery_urls(
     """
     urls = []
 
-    parsed_server_url = urlparse(server_url)
-    base_url = f"{parsed_server_url.scheme}://{parsed_server_url.netloc}"
-    path = parsed_server_url.path.rstrip("/")
-
     # First priority: URL from WWW-Authenticate header
     if www_auth_resource_metadata_url:
-        parsed_metadata_url = urlparse(www_auth_resource_metadata_url)
-        normalized_metadata_url = None
-        if parsed_metadata_url.scheme and parsed_metadata_url.netloc:
-            normalized_metadata_url = www_auth_resource_metadata_url
-        elif not parsed_metadata_url.scheme and parsed_metadata_url.netloc:
-            normalized_metadata_url = f"{parsed_server_url.scheme}:{www_auth_resource_metadata_url}"
-        elif (
-            not parsed_metadata_url.scheme
-            and not parsed_metadata_url.netloc
-            and parsed_metadata_url.path.startswith("/")
-        ):
-            first_segment = parsed_metadata_url.path.lstrip("/").split("/", 1)[0]
-            if first_segment == ".well-known" or "." not in first_segment:
-                normalized_metadata_url = urljoin(base_url, parsed_metadata_url.path)
-
-        if normalized_metadata_url:
-            urls.append(normalized_metadata_url)
+        urls.append(www_auth_resource_metadata_url)
 
     # Fallback: construct from server URL
+    parsed = urlparse(server_url)
+    base_url = f"{parsed.scheme}://{parsed.netloc}"
+    path = parsed.path.rstrip("/")
+
     # Priority 2: With path insertion (e.g., /.well-known/oauth-protected-resource/public/mcp)
     if path:
         path_url = f"{base_url}/.well-known/oauth-protected-resource{path}"

api/core/provider_manager.py

@@ -196,8 +196,6 @@ class ProviderManager:
 
             if preferred_provider_type_record:
                 preferred_provider_type = ProviderType.value_of(preferred_provider_type_record.preferred_provider_type)
-            elif dify_config.EDITION == "CLOUD" and system_configuration.enabled:
-                preferred_provider_type = ProviderType.SYSTEM
             elif custom_configuration.provider or custom_configuration.models:
                 preferred_provider_type = ProviderType.CUSTOM
             elif system_configuration.enabled:

api/core/rag/datasource/vdb/weaviate/weaviate_vector.py

@@ -5,7 +5,6 @@ This module provides integration with Weaviate vector database for storing and r
 document embeddings used in retrieval-augmented generation workflows.
 """
 
-import atexit
 import datetime
 import json
 import logging
@@ -38,32 +37,6 @@ _weaviate_client: weaviate.WeaviateClient | None = None
 _weaviate_client_lock = threading.Lock()
 
 
-def _shutdown_weaviate_client() -> None:
-    """
-    Best-effort shutdown hook to close the module-level Weaviate client.
-
-    This is registered with atexit so that HTTP/gRPC resources are released
-    when the Python interpreter exits.
-    """
-    global _weaviate_client
-
-    # Ensure thread-safety when accessing the shared client instance
-    with _weaviate_client_lock:
-        client = _weaviate_client
-        _weaviate_client = None
-
-    if client is not None:
-        try:
-            client.close()
-        except Exception:
-            # Best-effort cleanup; log at debug level and ignore errors.
-            logger.debug("Failed to close Weaviate client during shutdown", exc_info=True)
-
-
-# Register the shutdown hook once per process.
-atexit.register(_shutdown_weaviate_client)
-
-
 class WeaviateConfig(BaseModel):
     """
     Configuration model for Weaviate connection settings.
@@ -112,6 +85,18 @@ class WeaviateVector(BaseVector):
         self._client = self._init_client(config)
         self._attributes = attributes
 
+    def __del__(self):
+        """
+        Destructor to properly close the Weaviate client connection.
+        Prevents connection leaks and resource warnings.
+        """
+        if hasattr(self, "_client") and self._client is not None:
+            try:
+                self._client.close()
+            except Exception as e:
+                # Ignore errors during cleanup as object is being destroyed
+                logger.warning("Error closing Weaviate client %s", e, exc_info=True)
+
     def _init_client(self, config: WeaviateConfig) -> weaviate.WeaviateClient:
         """
         Initializes and returns a connected Weaviate client.

api/dify_graph/graph_engine/response_coordinator/__init__.py

@@ -6,5 +6,6 @@ of responses based on upstream node outputs and constants.
 """
 
 from .coordinator import ResponseStreamCoordinator
+from .session import RESPONSE_SESSION_NODE_TYPES
 
-__all__ = ["ResponseStreamCoordinator"]
+__all__ = ["RESPONSE_SESSION_NODE_TYPES", "ResponseStreamCoordinator"]

api/dify_graph/graph_engine/response_coordinator/session.py

@@ -3,6 +3,10 @@ Internal response session management for response coordinator.
 
 This module contains the private ResponseSession class used internally
 by ResponseStreamCoordinator to manage streaming sessions.
+
+`RESPONSE_SESSION_NODE_TYPES` is intentionally mutable so downstream applications
+can opt additional response-capable node types into session creation without
+patching the coordinator.
 """
 
 from __future__ import annotations
@@ -10,6 +14,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Protocol, cast
 
+from dify_graph.enums import BuiltinNodeTypes, NodeType
 from dify_graph.nodes.base.template import Template
 from dify_graph.runtime.graph_runtime_state import NodeProtocol
 
@@ -20,6 +25,12 @@ class _ResponseSessionNodeProtocol(NodeProtocol, Protocol):
     def get_streaming_template(self) -> Template: ...
 
 
+RESPONSE_SESSION_NODE_TYPES: list[NodeType] = [
+    BuiltinNodeTypes.ANSWER,
+    BuiltinNodeTypes.END,
+]
+
+
 @dataclass
 class ResponseSession:
     """
@@ -38,8 +49,8 @@ class ResponseSession:
         Create a ResponseSession from a response-capable node.
 
         The parameter is typed as `NodeProtocol` because the graph is exposed behind a protocol at the runtime layer.
-        At runtime this must be a node that implements `get_streaming_template()`. The coordinator decides which
-        graph nodes should be treated as response-capable before they reach this factory.
+        At runtime this must be a node whose `node_type` is listed in `RESPONSE_SESSION_NODE_TYPES`
+        and which implements `get_streaming_template()`.
 
         Args:
             node: Node from the materialized workflow graph.
@@ -48,8 +59,15 @@ class ResponseSession:
             ResponseSession configured with the node's streaming template
 
         Raises:
-            TypeError: If node does not implement the response-session streaming contract.
+            TypeError: If node is not a supported response node type.
         """
+        if node.node_type not in RESPONSE_SESSION_NODE_TYPES:
+            supported_node_types = ", ".join(RESPONSE_SESSION_NODE_TYPES)
+            raise TypeError(
+                "ResponseSession.from_node only supports node types in "
+                f"RESPONSE_SESSION_NODE_TYPES: {supported_node_types}"
+            )
+
         response_node = cast(_ResponseSessionNodeProtocol, node)
         try:
             template = response_node.get_streaming_template()

api/dify_graph/nodes/http_request/node.py

@@ -101,6 +101,7 @@ class HttpRequestNode(Node[HttpRequestNodeData]):
                 timeout=self._get_request_timeout(self.node_data),
                 variable_pool=self.graph_runtime_state.variable_pool,
                 http_request_config=self._http_request_config,
+                max_retries=0,
                 ssl_verify=self.node_data.ssl_verify,
                 http_client=self._http_client,
                 file_manager=self._file_manager,

api/dify_graph/nodes/human_input/entities.py

@@ -8,8 +8,6 @@ from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta
 from typing import Annotated, Any, ClassVar, Literal, Self
 
-import bleach
-import markdown
 from pydantic import BaseModel, Field, field_validator, model_validator
 
 from dify_graph.entities.base_node_data import BaseNodeData
@@ -60,39 +58,6 @@ class EmailDeliveryConfig(BaseModel):
     """Configuration for email delivery method."""
 
     URL_PLACEHOLDER: ClassVar[str] = "{{#url#}}"
-    _SUBJECT_NEWLINE_PATTERN: ClassVar[re.Pattern[str]] = re.compile(r"[\r\n]+")
-    _ALLOWED_HTML_TAGS: ClassVar[list[str]] = [
-        "a",
-        "blockquote",
-        "br",
-        "code",
-        "em",
-        "h1",
-        "h2",
-        "h3",
-        "h4",
-        "h5",
-        "h6",
-        "hr",
-        "li",
-        "ol",
-        "p",
-        "pre",
-        "strong",
-        "table",
-        "tbody",
-        "td",
-        "th",
-        "thead",
-        "tr",
-        "ul",
-    ]
-    _ALLOWED_HTML_ATTRIBUTES: ClassVar[dict[str, list[str]]] = {
-        "a": ["href", "title"],
-        "td": ["align"],
-        "th": ["align"],
-    }
-    _ALLOWED_PROTOCOLS: ClassVar[list[str]] = ["http", "https", "mailto"]
 
     recipients: EmailRecipients
 
@@ -133,43 +98,6 @@ class EmailDeliveryConfig(BaseModel):
             return templated_body
         return variable_pool.convert_template(templated_body).text
 
-    @classmethod
-    def render_markdown_body(cls, body: str) -> str:
-        """Render markdown to safe HTML for email delivery."""
-        sanitized_markdown = bleach.clean(
-            body,
-            tags=[],
-            attributes={},
-            strip=True,
-            strip_comments=True,
-        )
-        rendered_html = markdown.markdown(
-            sanitized_markdown,
-            extensions=["nl2br", "tables"],
-            extension_configs={"tables": {"use_align_attribute": True}},
-        )
-        return bleach.clean(
-            rendered_html,
-            tags=cls._ALLOWED_HTML_TAGS,
-            attributes=cls._ALLOWED_HTML_ATTRIBUTES,
-            protocols=cls._ALLOWED_PROTOCOLS,
-            strip=True,
-            strip_comments=True,
-        )
-
-    @classmethod
-    def sanitize_subject(cls, subject: str) -> str:
-        """Sanitize email subject to plain text and prevent CRLF injection."""
-        sanitized_subject = bleach.clean(
-            subject,
-            tags=[],
-            attributes={},
-            strip=True,
-            strip_comments=True,
-        )
-        sanitized_subject = cls._SUBJECT_NEWLINE_PATTERN.sub(" ", sanitized_subject)
-        return " ".join(sanitized_subject.split())
-
 
 class _DeliveryMethodBase(BaseModel):
     """Base delivery method configuration."""

api/dify_graph/nodes/llm/llm_utils.py

@@ -256,13 +256,9 @@ def fetch_prompt_messages(
                 ):
                     continue
                 prompt_message_content.append(content_item)
-            if not prompt_message_content:
-                continue
-            if len(prompt_message_content) == 1 and prompt_message_content[0].type == PromptMessageContentType.TEXT:
-                prompt_message.content = prompt_message_content[0].data
-            else:
+            if prompt_message_content:
                 prompt_message.content = prompt_message_content
-            filtered_prompt_messages.append(prompt_message)
+                filtered_prompt_messages.append(prompt_message)
         elif not prompt_message.is_empty():
             filtered_prompt_messages.append(prompt_message)
 

api/dify_graph/variables/types.py

@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING, Any
 from dify_graph.file.models import File
 
 if TYPE_CHECKING:
-    from dify_graph.variables.segments import Segment
+    pass
 
 
 class ArrayValidation(StrEnum):
@@ -219,7 +219,7 @@ class SegmentType(StrEnum):
         return _ARRAY_ELEMENT_TYPES_MAPPING.get(self)
 
     @staticmethod
-    def get_zero_value(t: SegmentType) -> Segment:
+    def get_zero_value(t: SegmentType):
         # Lazy import to avoid circular dependency
         from factories import variable_factory
 

api/extensions/ext_fastopenapi.py

@@ -1,5 +1,3 @@
-from typing import Protocol, cast
-
 from fastopenapi.routers import FlaskRouter
 from flask_cors import CORS
 
@@ -11,10 +9,6 @@ from extensions.ext_blueprints import AUTHENTICATED_HEADERS, EXPOSED_HEADERS
 DOCS_PREFIX = "/fastopenapi"
 
 
-class SupportsIncludeRouter(Protocol):
-    def include_router(self, router: object, *, prefix: str = "") -> None: ...
-
-
 def init_app(app: DifyApp) -> None:
     docs_enabled = dify_config.SWAGGER_UI_ENABLED
     docs_url = f"{DOCS_PREFIX}/docs" if docs_enabled else None
@@ -42,7 +36,7 @@ def init_app(app: DifyApp) -> None:
     _ = remote_files
     _ = setup
 
-    cast(SupportsIncludeRouter, router).include_router(console_router, prefix="/console/api")
+    router.include_router(console_router, prefix="/console/api")
     CORS(
         app,
         resources={r"/console/api/.*": {"origins": dify_config.CONSOLE_CORS_ALLOW_ORIGINS}},

api/extensions/otel/runtime.py

@@ -5,7 +5,7 @@ from typing import Union
 
 from celery.signals import worker_init
 from flask_login import user_loaded_from_request, user_logged_in
-from opentelemetry import metrics, trace
+from opentelemetry import trace
 from opentelemetry.propagate import set_global_textmap
 from opentelemetry.propagators.b3 import B3MultiFormat
 from opentelemetry.propagators.composite import CompositePropagator
@@ -31,29 +31,9 @@ def setup_context_propagation() -> None:
 
 
 def shutdown_tracer() -> None:
-    flush_telemetry()
-
-
-def flush_telemetry() -> None:
-    """
-    Best-effort flush for telemetry providers.
-
-    This is mainly used by short-lived command processes (e.g. Kubernetes CronJob)
-    so counters/histograms are exported before the process exits.
-    """
     provider = trace.get_tracer_provider()
     if hasattr(provider, "force_flush"):
-        try:
-            provider.force_flush()
-        except Exception:
-            logger.exception("otel: failed to flush trace provider")
-
-    metric_provider = metrics.get_meter_provider()
-    if hasattr(metric_provider, "force_flush"):
-        try:
-            metric_provider.force_flush()
-        except Exception:
-            logger.exception("otel: failed to flush metric provider")
+        provider.force_flush()
 
 
 def is_celery_worker():

api/factories/variable_factory.py

@@ -55,7 +55,7 @@ class TypeMismatchError(Exception):
 
 
 # Define the constant
-SEGMENT_TO_VARIABLE_MAP: Mapping[type[Segment], type[VariableBase]] = {
+SEGMENT_TO_VARIABLE_MAP = {
     ArrayAnySegment: ArrayAnyVariable,
     ArrayBooleanSegment: ArrayBooleanVariable,
     ArrayFileSegment: ArrayFileVariable,
@@ -296,11 +296,13 @@ def segment_to_variable(
         raise UnsupportedSegmentTypeError(f"not supported segment type {segment_type}")
 
     variable_class = SEGMENT_TO_VARIABLE_MAP[segment_type]
-    return variable_class(
-        id=id,
-        name=name,
-        description=description,
-        value_type=segment.value_type,
-        value=segment.value,
-        selector=list(selector),
+    return cast(
+        VariableBase,
+        variable_class(
+            id=id,
+            name=name,
+            description=description,
+            value=segment.value,
+            selector=list(selector),
+        ),
     )

api/libs/helper.py

@@ -32,11 +32,6 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-def _stream_with_request_context(response: object) -> Any:
-    """Bridge Flask's loosely-typed streaming helper without leaking casts into callers."""
-    return cast(Any, stream_with_context)(response)
-
-
 def escape_like_pattern(pattern: str) -> str:
     """
     Escape special characters in a string for safe use in SQL LIKE patterns.
@@ -291,32 +286,22 @@ def generate_text_hash(text: str) -> str:
     return sha256(hash_text.encode()).hexdigest()
 
 
-def compact_generate_response(
-    response: Mapping[str, Any] | Generator[str, None, None] | RateLimitGenerator,
-) -> Response:
-    if isinstance(response, Mapping):
+def compact_generate_response(response: Union[Mapping, Generator, RateLimitGenerator]) -> Response:
+    if isinstance(response, dict):
         return Response(
             response=json.dumps(jsonable_encoder(response)),
             status=200,
             content_type="application/json; charset=utf-8",
         )
     else:
-        stream_response = response
 
-        def generate() -> Generator[str, None, None]:
-            yield from stream_response
+        def generate() -> Generator:
+            yield from response
 
-        return Response(
-            _stream_with_request_context(generate()),
-            status=200,
-            mimetype="text/event-stream",
-        )
+        return Response(stream_with_context(generate()), status=200, mimetype="text/event-stream")
 
 
-def length_prefixed_response(
-    magic_number: int,
-    response: Mapping[str, Any] | BaseModel | Generator[str | bytes, None, None] | RateLimitGenerator,
-) -> Response:
+def length_prefixed_response(magic_number: int, response: Union[Mapping, Generator, RateLimitGenerator]) -> Response:
     """
     This function is used to return a response with a length prefix.
     Magic number is a one byte number that indicates the type of the response.
@@ -347,7 +332,7 @@ def length_prefixed_response(
         # | Magic Number 1byte | Reserved 1byte | Header Length 2bytes | Data Length 4bytes | Reserved 6bytes | Data
         return struct.pack("<BBHI", magic_number, 0, header_length, data_length) + b"\x00" * 6 + response
 
-    if isinstance(response, Mapping):
+    if isinstance(response, dict):
         return Response(
             response=pack_response_with_length_prefix(json.dumps(jsonable_encoder(response)).encode("utf-8")),
             status=200,
@@ -360,20 +345,14 @@ def length_prefixed_response(
             mimetype="application/json",
         )
 
-    stream_response = response
-
-    def generate() -> Generator[bytes, None, None]:
-        for chunk in stream_response:
+    def generate() -> Generator:
+        for chunk in response:
             if isinstance(chunk, str):
                 yield pack_response_with_length_prefix(chunk.encode("utf-8"))
             else:
                 yield pack_response_with_length_prefix(chunk)
 
-    return Response(
-        _stream_with_request_context(generate()),
-        status=200,
-        mimetype="text/event-stream",
-    )
+    return Response(stream_with_context(generate()), status=200, mimetype="text/event-stream")
 
 
 class TokenManager:

api/libs/login.py

@@ -77,14 +77,12 @@ def login_required(func: Callable[P, R]) -> Callable[P, R | ResponseReturnValue]
     @wraps(func)
     def decorated_view(*args: P.args, **kwargs: P.kwargs) -> R | ResponseReturnValue:
         if request.method in EXEMPT_METHODS or dify_config.LOGIN_DISABLED:
-            return current_app.ensure_sync(func)(*args, **kwargs)
-
-        user = _get_user()
-        if user is None or not user.is_authenticated:
+            pass
+        elif current_user is not None and not current_user.is_authenticated:
             return current_app.login_manager.unauthorized()  # type: ignore
         # we put csrf validation here for less conflicts
         # TODO: maybe find a better place for it.
-        check_csrf_token(request, user.id)
+        check_csrf_token(request, current_user.id)
         return current_app.ensure_sync(func)(*args, **kwargs)
 
     return decorated_view

api/libs/module_loading.py

@@ -7,10 +7,9 @@ https://github.com/django/django/blob/main/django/utils/module_loading.py
 
 import sys
 from importlib import import_module
-from typing import Any
 
 
-def cached_import(module_path: str, class_name: str) -> Any:
+def cached_import(module_path: str, class_name: str):
     """
     Import a module and return the named attribute/class from it, with caching.
 
@@ -21,14 +20,16 @@ def cached_import(module_path: str, class_name: str) -> Any:
     Returns:
         The imported attribute/class
     """
-    module = sys.modules.get(module_path)
-    spec = getattr(module, "__spec__", None) if module is not None else None
-    if module is None or getattr(spec, "_initializing", False):
+    if not (
+        (module := sys.modules.get(module_path))
+        and (spec := getattr(module, "__spec__", None))
+        and getattr(spec, "_initializing", False) is False
+    ):
         module = import_module(module_path)
     return getattr(module, class_name)
 
 
-def import_string(dotted_path: str) -> Any:
+def import_string(dotted_path: str):
     """
     Import a dotted module path and return the attribute/class designated by
     the last name in the path. Raise ImportError if the import failed.

api/libs/oauth.py

@@ -1,48 +1,7 @@
-import sys
 import urllib.parse
 from dataclasses import dataclass
-from typing import NotRequired
 
 import httpx
-from pydantic import TypeAdapter
-
-if sys.version_info >= (3, 12):
-    from typing import TypedDict
-else:
-    from typing_extensions import TypedDict
-
-JsonObject = dict[str, object]
-JsonObjectList = list[JsonObject]
-
-JSON_OBJECT_ADAPTER = TypeAdapter(JsonObject)
-JSON_OBJECT_LIST_ADAPTER = TypeAdapter(JsonObjectList)
-
-
-class AccessTokenResponse(TypedDict, total=False):
-    access_token: str
-
-
-class GitHubEmailRecord(TypedDict, total=False):
-    email: str
-    primary: bool
-
-
-class GitHubRawUserInfo(TypedDict):
-    id: int | str
-    login: str
-    name: NotRequired[str]
-    email: NotRequired[str]
-
-
-class GoogleRawUserInfo(TypedDict):
-    sub: str
-    email: str
-
-
-ACCESS_TOKEN_RESPONSE_ADAPTER = TypeAdapter(AccessTokenResponse)
-GITHUB_RAW_USER_INFO_ADAPTER = TypeAdapter(GitHubRawUserInfo)
-GITHUB_EMAIL_RECORDS_ADAPTER = TypeAdapter(list[GitHubEmailRecord])
-GOOGLE_RAW_USER_INFO_ADAPTER = TypeAdapter(GoogleRawUserInfo)
 
 
 @dataclass
@@ -52,38 +11,26 @@ class OAuthUserInfo:
     email: str
 
 
-def _json_object(response: httpx.Response) -> JsonObject:
-    return JSON_OBJECT_ADAPTER.validate_python(response.json())
-
-
-def _json_list(response: httpx.Response) -> JsonObjectList:
-    return JSON_OBJECT_LIST_ADAPTER.validate_python(response.json())
-
-
 class OAuth:
-    client_id: str
-    client_secret: str
-    redirect_uri: str
-
     def __init__(self, client_id: str, client_secret: str, redirect_uri: str):
         self.client_id = client_id
         self.client_secret = client_secret
         self.redirect_uri = redirect_uri
 
-    def get_authorization_url(self, invite_token: str | None = None) -> str:
+    def get_authorization_url(self):
         raise NotImplementedError()
 
-    def get_access_token(self, code: str) -> str:
+    def get_access_token(self, code: str):
         raise NotImplementedError()
 
-    def get_raw_user_info(self, token: str) -> JsonObject:
+    def get_raw_user_info(self, token: str):
         raise NotImplementedError()
 
     def get_user_info(self, token: str) -> OAuthUserInfo:
         raw_info = self.get_raw_user_info(token)
         return self._transform_user_info(raw_info)
 
-    def _transform_user_info(self, raw_info: JsonObject) -> OAuthUserInfo:
+    def _transform_user_info(self, raw_info: dict) -> OAuthUserInfo:
         raise NotImplementedError()
 
 
@@ -93,7 +40,7 @@ class GitHubOAuth(OAuth):
     _USER_INFO_URL = "https://api.github.com/user"
     _EMAIL_INFO_URL = "https://api.github.com/user/emails"
 
-    def get_authorization_url(self, invite_token: str | None = None) -> str:
+    def get_authorization_url(self, invite_token: str | None = None):
         params = {
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
@@ -103,7 +50,7 @@ class GitHubOAuth(OAuth):
             params["state"] = invite_token
         return f"{self._AUTH_URL}?{urllib.parse.urlencode(params)}"
 
-    def get_access_token(self, code: str) -> str:
+    def get_access_token(self, code: str):
         data = {
             "client_id": self.client_id,
             "client_secret": self.client_secret,
@@ -113,7 +60,7 @@ class GitHubOAuth(OAuth):
         headers = {"Accept": "application/json"}
         response = httpx.post(self._TOKEN_URL, data=data, headers=headers)
 
-        response_json = ACCESS_TOKEN_RESPONSE_ADAPTER.validate_python(_json_object(response))
+        response_json = response.json()
         access_token = response_json.get("access_token")
 
         if not access_token:
@@ -121,24 +68,23 @@ class GitHubOAuth(OAuth):
 
         return access_token
 
-    def get_raw_user_info(self, token: str) -> JsonObject:
+    def get_raw_user_info(self, token: str):
         headers = {"Authorization": f"token {token}"}
         response = httpx.get(self._USER_INFO_URL, headers=headers)
         response.raise_for_status()
-        user_info = GITHUB_RAW_USER_INFO_ADAPTER.validate_python(_json_object(response))
+        user_info = response.json()
 
         email_response = httpx.get(self._EMAIL_INFO_URL, headers=headers)
-        email_info = GITHUB_EMAIL_RECORDS_ADAPTER.validate_python(_json_list(email_response))
-        primary_email = next((email for email in email_info if email.get("primary") is True), None)
+        email_info = email_response.json()
+        primary_email: dict = next((email for email in email_info if email["primary"] == True), {})
 
-        return {**user_info, "email": primary_email.get("email", "") if primary_email else ""}
+        return {**user_info, "email": primary_email.get("email", "")}
 
-    def _transform_user_info(self, raw_info: JsonObject) -> OAuthUserInfo:
-        payload = GITHUB_RAW_USER_INFO_ADAPTER.validate_python(raw_info)
-        email = payload.get("email")
+    def _transform_user_info(self, raw_info: dict) -> OAuthUserInfo:
+        email = raw_info.get("email")
         if not email:
-            email = f"{payload['id']}+{payload['login']}@users.noreply.github.com"
-        return OAuthUserInfo(id=str(payload["id"]), name=str(payload.get("name", "")), email=email)
+            email = f"{raw_info['id']}+{raw_info['login']}@users.noreply.github.com"
+        return OAuthUserInfo(id=str(raw_info["id"]), name=raw_info["name"], email=email)
 
 
 class GoogleOAuth(OAuth):
@@ -146,7 +92,7 @@ class GoogleOAuth(OAuth):
     _TOKEN_URL = "https://oauth2.googleapis.com/token"
     _USER_INFO_URL = "https://www.googleapis.com/oauth2/v3/userinfo"
 
-    def get_authorization_url(self, invite_token: str | None = None) -> str:
+    def get_authorization_url(self, invite_token: str | None = None):
         params = {
             "client_id": self.client_id,
             "response_type": "code",
@@ -157,7 +103,7 @@ class GoogleOAuth(OAuth):
             params["state"] = invite_token
         return f"{self._AUTH_URL}?{urllib.parse.urlencode(params)}"
 
-    def get_access_token(self, code: str) -> str:
+    def get_access_token(self, code: str):
         data = {
             "client_id": self.client_id,
             "client_secret": self.client_secret,
@@ -168,7 +114,7 @@ class GoogleOAuth(OAuth):
         headers = {"Accept": "application/json"}
         response = httpx.post(self._TOKEN_URL, data=data, headers=headers)
 
-        response_json = ACCESS_TOKEN_RESPONSE_ADAPTER.validate_python(_json_object(response))
+        response_json = response.json()
         access_token = response_json.get("access_token")
 
         if not access_token:
@@ -176,12 +122,11 @@ class GoogleOAuth(OAuth):
 
         return access_token
 
-    def get_raw_user_info(self, token: str) -> JsonObject:
+    def get_raw_user_info(self, token: str):
         headers = {"Authorization": f"Bearer {token}"}
         response = httpx.get(self._USER_INFO_URL, headers=headers)
         response.raise_for_status()
-        return _json_object(response)
+        return response.json()
 
-    def _transform_user_info(self, raw_info: JsonObject) -> OAuthUserInfo:
-        payload = GOOGLE_RAW_USER_INFO_ADAPTER.validate_python(raw_info)
-        return OAuthUserInfo(id=str(payload["sub"]), name="", email=payload["email"])
+    def _transform_user_info(self, raw_info: dict) -> OAuthUserInfo:
+        return OAuthUserInfo(id=str(raw_info["sub"]), name="", email=raw_info["email"])

api/libs/oauth_data_source.py

@@ -1,57 +1,25 @@
-import sys
 import urllib.parse
-from typing import Any, Literal
+from typing import Any
 
 import httpx
 from flask_login import current_user
-from pydantic import TypeAdapter
 from sqlalchemy import select
 
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.source import DataSourceOauthBinding
 
-if sys.version_info >= (3, 12):
-    from typing import TypedDict
-else:
-    from typing_extensions import TypedDict
-
-
-class NotionPageSummary(TypedDict):
-    page_id: str
-    page_name: str
-    page_icon: dict[str, str] | None
-    parent_id: str
-    type: Literal["page", "database"]
-
-
-class NotionSourceInfo(TypedDict):
-    workspace_name: str | None
-    workspace_icon: str | None
-    workspace_id: str | None
-    pages: list[NotionPageSummary]
-    total: int
-
-
-SOURCE_INFO_STORAGE_ADAPTER = TypeAdapter(dict[str, object])
-NOTION_SOURCE_INFO_ADAPTER = TypeAdapter(NotionSourceInfo)
-NOTION_PAGE_SUMMARY_ADAPTER = TypeAdapter(NotionPageSummary)
-
 
 class OAuthDataSource:
-    client_id: str
-    client_secret: str
-    redirect_uri: str
-
     def __init__(self, client_id: str, client_secret: str, redirect_uri: str):
         self.client_id = client_id
         self.client_secret = client_secret
         self.redirect_uri = redirect_uri
 
-    def get_authorization_url(self) -> str:
+    def get_authorization_url(self):
         raise NotImplementedError()
 
-    def get_access_token(self, code: str) -> None:
+    def get_access_token(self, code: str):
         raise NotImplementedError()
 
 
@@ -62,7 +30,7 @@ class NotionOAuth(OAuthDataSource):
     _NOTION_BLOCK_SEARCH = "https://api.notion.com/v1/blocks"
     _NOTION_BOT_USER = "https://api.notion.com/v1/users/me"
 
-    def get_authorization_url(self) -> str:
+    def get_authorization_url(self):
         params = {
             "client_id": self.client_id,
             "response_type": "code",
@@ -71,7 +39,7 @@ class NotionOAuth(OAuthDataSource):
         }
         return f"{self._AUTH_URL}?{urllib.parse.urlencode(params)}"
 
-    def get_access_token(self, code: str) -> None:
+    def get_access_token(self, code: str):
         data = {"code": code, "grant_type": "authorization_code", "redirect_uri": self.redirect_uri}
         headers = {"Accept": "application/json"}
         auth = (self.client_id, self.client_secret)
@@ -86,12 +54,13 @@ class NotionOAuth(OAuthDataSource):
         workspace_id = response_json.get("workspace_id")
         # get all authorized pages
         pages = self.get_authorized_pages(access_token)
-        source_info = self._build_source_info(
-            workspace_name=workspace_name,
-            workspace_icon=workspace_icon,
-            workspace_id=workspace_id,
-            pages=pages,
-        )
+        source_info = {
+            "workspace_name": workspace_name,
+            "workspace_icon": workspace_icon,
+            "workspace_id": workspace_id,
+            "pages": pages,
+            "total": len(pages),
+        }
         # save data source binding
         data_source_binding = db.session.scalar(
             select(DataSourceOauthBinding).where(
@@ -101,7 +70,7 @@ class NotionOAuth(OAuthDataSource):
             )
         )
         if data_source_binding:
-            data_source_binding.source_info = SOURCE_INFO_STORAGE_ADAPTER.validate_python(source_info)
+            data_source_binding.source_info = source_info
             data_source_binding.disabled = False
             data_source_binding.updated_at = naive_utc_now()
             db.session.commit()
@@ -109,24 +78,25 @@ class NotionOAuth(OAuthDataSource):
             new_data_source_binding = DataSourceOauthBinding(
                 tenant_id=current_user.current_tenant_id,
                 access_token=access_token,
-                source_info=SOURCE_INFO_STORAGE_ADAPTER.validate_python(source_info),
+                source_info=source_info,
                 provider="notion",
             )
             db.session.add(new_data_source_binding)
             db.session.commit()
 
-    def save_internal_access_token(self, access_token: str) -> None:
+    def save_internal_access_token(self, access_token: str):
         workspace_name = self.notion_workspace_name(access_token)
         workspace_icon = None
         workspace_id = current_user.current_tenant_id
         # get all authorized pages
         pages = self.get_authorized_pages(access_token)
-        source_info = self._build_source_info(
-            workspace_name=workspace_name,
-            workspace_icon=workspace_icon,
-            workspace_id=workspace_id,
-            pages=pages,
-        )
+        source_info = {
+            "workspace_name": workspace_name,
+            "workspace_icon": workspace_icon,
+            "workspace_id": workspace_id,
+            "pages": pages,
+            "total": len(pages),
+        }
         # save data source binding
         data_source_binding = db.session.scalar(
             select(DataSourceOauthBinding).where(
@@ -136,7 +106,7 @@ class NotionOAuth(OAuthDataSource):
             )
         )
         if data_source_binding:
-            data_source_binding.source_info = SOURCE_INFO_STORAGE_ADAPTER.validate_python(source_info)
+            data_source_binding.source_info = source_info
             data_source_binding.disabled = False
             data_source_binding.updated_at = naive_utc_now()
             db.session.commit()
@@ -144,13 +114,13 @@ class NotionOAuth(OAuthDataSource):
             new_data_source_binding = DataSourceOauthBinding(
                 tenant_id=current_user.current_tenant_id,
                 access_token=access_token,
-                source_info=SOURCE_INFO_STORAGE_ADAPTER.validate_python(source_info),
+                source_info=source_info,
                 provider="notion",
             )
             db.session.add(new_data_source_binding)
             db.session.commit()
 
-    def sync_data_source(self, binding_id: str) -> None:
+    def sync_data_source(self, binding_id: str):
         # save data source binding
         data_source_binding = db.session.scalar(
             select(DataSourceOauthBinding).where(
@@ -164,22 +134,23 @@ class NotionOAuth(OAuthDataSource):
         if data_source_binding:
             # get all authorized pages
             pages = self.get_authorized_pages(data_source_binding.access_token)
-            source_info = NOTION_SOURCE_INFO_ADAPTER.validate_python(data_source_binding.source_info)
-            new_source_info = self._build_source_info(
-                workspace_name=source_info["workspace_name"],
-                workspace_icon=source_info["workspace_icon"],
-                workspace_id=source_info["workspace_id"],
-                pages=pages,
-            )
-            data_source_binding.source_info = SOURCE_INFO_STORAGE_ADAPTER.validate_python(new_source_info)
+            source_info = data_source_binding.source_info
+            new_source_info = {
+                "workspace_name": source_info["workspace_name"],
+                "workspace_icon": source_info["workspace_icon"],
+                "workspace_id": source_info["workspace_id"],
+                "pages": pages,
+                "total": len(pages),
+            }
+            data_source_binding.source_info = new_source_info
             data_source_binding.disabled = False
             data_source_binding.updated_at = naive_utc_now()
             db.session.commit()
         else:
             raise ValueError("Data source binding not found")
 
-    def get_authorized_pages(self, access_token: str) -> list[NotionPageSummary]:
-        pages: list[NotionPageSummary] = []
+    def get_authorized_pages(self, access_token: str):
+        pages = []
         page_results = self.notion_page_search(access_token)
         database_results = self.notion_database_search(access_token)
         # get page detail
@@ -216,7 +187,7 @@ class NotionOAuth(OAuthDataSource):
                 "parent_id": parent_id,
                 "type": "page",
             }
-            pages.append(NOTION_PAGE_SUMMARY_ADAPTER.validate_python(page))
+            pages.append(page)
             # get database detail
         for database_result in database_results:
             page_id = database_result["id"]
@@ -249,11 +220,11 @@ class NotionOAuth(OAuthDataSource):
                 "parent_id": parent_id,
                 "type": "database",
             }
-            pages.append(NOTION_PAGE_SUMMARY_ADAPTER.validate_python(page))
+            pages.append(page)
         return pages
 
-    def notion_page_search(self, access_token: str) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
+    def notion_page_search(self, access_token: str):
+        results = []
         next_cursor = None
         has_more = True
 
@@ -278,7 +249,7 @@ class NotionOAuth(OAuthDataSource):
 
         return results
 
-    def notion_block_parent_page_id(self, access_token: str, block_id: str) -> str:
+    def notion_block_parent_page_id(self, access_token: str, block_id: str):
         headers = {
             "Authorization": f"Bearer {access_token}",
             "Notion-Version": "2022-06-28",
@@ -294,7 +265,7 @@ class NotionOAuth(OAuthDataSource):
             return self.notion_block_parent_page_id(access_token, parent[parent_type])
         return parent[parent_type]
 
-    def notion_workspace_name(self, access_token: str) -> str:
+    def notion_workspace_name(self, access_token: str):
         headers = {
             "Authorization": f"Bearer {access_token}",
             "Notion-Version": "2022-06-28",
@@ -308,8 +279,8 @@ class NotionOAuth(OAuthDataSource):
                 return user_info["workspace_name"]
         return "workspace"
 
-    def notion_database_search(self, access_token: str) -> list[dict[str, Any]]:
-        results: list[dict[str, Any]] = []
+    def notion_database_search(self, access_token: str):
+        results = []
         next_cursor = None
         has_more = True
 
@@ -332,19 +303,3 @@ class NotionOAuth(OAuthDataSource):
             next_cursor = response_json.get("next_cursor", None)
 
         return results
-
-    @staticmethod
-    def _build_source_info(
-        *,
-        workspace_name: str | None,
-        workspace_icon: str | None,
-        workspace_id: str | None,
-        pages: list[NotionPageSummary],
-    ) -> NotionSourceInfo:
-        return {
-            "workspace_name": workspace_name,
-            "workspace_icon": workspace_icon,
-            "workspace_id": workspace_id,
-            "pages": pages,
-            "total": len(pages),
-        }

api/migrations/versions/2026_03_04_1600-6b5f9f8b1a2c_add_user_id_to_workflow_draft_variables.py

@@ -1,69 +0,0 @@
-"""add user_id and switch workflow_draft_variables unique key to user scope
-
-Revision ID: 6b5f9f8b1a2c
-Revises: 0ec65df55790
-Create Date: 2026-03-04 16:00:00.000000
-
-"""
-
-import sqlalchemy as sa
-from alembic import op
-
-import models as models
-
-# revision identifiers, used by Alembic.
-revision = "6b5f9f8b1a2c"
-down_revision = "0ec65df55790"
-branch_labels = None
-depends_on = None
-
-
-def _is_pg(conn) -> bool:
-    return conn.dialect.name == "postgresql"
-
-
-def upgrade():
-    conn = op.get_bind()
-    table_name = "workflow_draft_variables"
-
-    with op.batch_alter_table(table_name, schema=None) as batch_op:
-        batch_op.add_column(sa.Column("user_id", models.types.StringUUID(), nullable=True))
-
-    if _is_pg(conn):
-        with op.get_context().autocommit_block():
-            op.create_index(
-                "workflow_draft_variables_app_id_user_id_key",
-                "workflow_draft_variables",
-                ["app_id", "user_id", "node_id", "name"],
-                unique=True,
-                postgresql_concurrently=True,
-            )
-    else:
-        op.create_index(
-            "workflow_draft_variables_app_id_user_id_key",
-            "workflow_draft_variables",
-            ["app_id", "user_id", "node_id", "name"],
-            unique=True,
-        )
-
-    with op.batch_alter_table(table_name, schema=None) as batch_op:
-        batch_op.drop_constraint(op.f("workflow_draft_variables_app_id_key"), type_="unique")
-
-
-def downgrade():
-    conn = op.get_bind()
-
-    with op.batch_alter_table("workflow_draft_variables", schema=None) as batch_op:
-        batch_op.create_unique_constraint(
-            op.f("workflow_draft_variables_app_id_key"),
-            ["app_id", "node_id", "name"],
-        )
-
-    if _is_pg(conn):
-        with op.get_context().autocommit_block():
-            op.drop_index("workflow_draft_variables_app_id_user_id_key", postgresql_concurrently=True)
-    else:
-        op.drop_index("workflow_draft_variables_app_id_user_id_key", table_name="workflow_draft_variables")
-
-    with op.batch_alter_table("workflow_draft_variables", schema=None) as batch_op:
-        batch_op.drop_column("user_id")

api/models/dataset.py

@@ -10,7 +10,7 @@ import re
 import time
 from datetime import datetime
 from json import JSONDecodeError
-from typing import Any, TypedDict, cast
+from typing import Any, cast
 from uuid import uuid4
 
 import sqlalchemy as sa
@@ -37,61 +37,6 @@ from .types import AdjustedJSON, BinaryData, EnumText, LongText, StringUUID, adj
 logger = logging.getLogger(__name__)
 
 
-class PreProcessingRuleItem(TypedDict):
-    id: str
-    enabled: bool
-
-
-class SegmentationConfig(TypedDict):
-    delimiter: str
-    max_tokens: int
-    chunk_overlap: int
-
-
-class AutomaticRulesConfig(TypedDict):
-    pre_processing_rules: list[PreProcessingRuleItem]
-    segmentation: SegmentationConfig
-
-
-class ProcessRuleDict(TypedDict):
-    id: str
-    dataset_id: str
-    mode: str
-    rules: dict[str, Any] | None
-
-
-class DocMetadataDetailItem(TypedDict):
-    id: str
-    name: str
-    type: str
-    value: Any
-
-
-class AttachmentItem(TypedDict):
-    id: str
-    name: str
-    size: int
-    extension: str
-    mime_type: str
-    source_url: str
-
-
-class DatasetBindingItem(TypedDict):
-    id: str
-    name: str
-
-
-class ExternalKnowledgeApiDict(TypedDict):
-    id: str
-    tenant_id: str
-    name: str
-    description: str
-    settings: dict[str, Any] | None
-    dataset_bindings: list[DatasetBindingItem]
-    created_by: str
-    created_at: str
-
-
 class DatasetPermissionEnum(enum.StrEnum):
     ONLY_ME = "only_me"
     ALL_TEAM = "all_team_members"
@@ -389,7 +334,7 @@ class DatasetProcessRule(Base):  # bug
 
     MODES = ["automatic", "custom", "hierarchical"]
     PRE_PROCESSING_RULES = ["remove_stopwords", "remove_extra_spaces", "remove_urls_emails"]
-    AUTOMATIC_RULES: AutomaticRulesConfig = {
+    AUTOMATIC_RULES: dict[str, Any] = {
         "pre_processing_rules": [
             {"id": "remove_extra_spaces", "enabled": True},
             {"id": "remove_urls_emails", "enabled": False},
@@ -397,7 +342,7 @@ class DatasetProcessRule(Base):  # bug
         "segmentation": {"delimiter": "\n", "max_tokens": 500, "chunk_overlap": 50},
     }
 
-    def to_dict(self) -> ProcessRuleDict:
+    def to_dict(self) -> dict[str, Any]:
         return {
             "id": self.id,
             "dataset_id": self.dataset_id,
@@ -586,7 +531,7 @@ class Document(Base):
         return self.updated_at
 
     @property
-    def doc_metadata_details(self) -> list[DocMetadataDetailItem] | None:
+    def doc_metadata_details(self) -> list[dict[str, Any]] | None:
         if self.doc_metadata:
             document_metadatas = (
                 db.session.query(DatasetMetadata)
@@ -596,9 +541,9 @@ class Document(Base):
                 )
                 .all()
             )
-            metadata_list: list[DocMetadataDetailItem] = []
+            metadata_list: list[dict[str, Any]] = []
             for metadata in document_metadatas:
-                metadata_dict: DocMetadataDetailItem = {
+                metadata_dict: dict[str, Any] = {
                     "id": metadata.id,
                     "name": metadata.name,
                     "type": metadata.type,
@@ -612,13 +557,13 @@ class Document(Base):
         return None
 
     @property
-    def process_rule_dict(self) -> ProcessRuleDict | None:
+    def process_rule_dict(self) -> dict[str, Any] | None:
         if self.dataset_process_rule_id and self.dataset_process_rule:
             return self.dataset_process_rule.to_dict()
         return None
 
-    def get_built_in_fields(self) -> list[DocMetadataDetailItem]:
-        built_in_fields: list[DocMetadataDetailItem] = []
+    def get_built_in_fields(self) -> list[dict[str, Any]]:
+        built_in_fields: list[dict[str, Any]] = []
         built_in_fields.append(
             {
                 "id": "built-in",
@@ -932,7 +877,7 @@ class DocumentSegment(Base):
         return text
 
     @property
-    def attachments(self) -> list[AttachmentItem]:
+    def attachments(self) -> list[dict[str, Any]]:
         # Use JOIN to fetch attachments in a single query instead of two separate queries
         attachments_with_bindings = db.session.execute(
             select(SegmentAttachmentBinding, UploadFile)
@@ -946,7 +891,7 @@ class DocumentSegment(Base):
         ).all()
         if not attachments_with_bindings:
             return []
-        attachment_list: list[AttachmentItem] = []
+        attachment_list = []
         for _, attachment in attachments_with_bindings:
             upload_file_id = attachment.id
             nonce = os.urandom(16).hex()
@@ -1316,7 +1261,7 @@ class ExternalKnowledgeApis(TypeBase):
         DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp(), init=False
     )
 
-    def to_dict(self) -> ExternalKnowledgeApiDict:
+    def to_dict(self) -> dict[str, Any]:
         return {
             "id": self.id,
             "tenant_id": self.tenant_id,
@@ -1336,13 +1281,13 @@ class ExternalKnowledgeApis(TypeBase):
             return None
 
     @property
-    def dataset_bindings(self) -> list[DatasetBindingItem]:
+    def dataset_bindings(self) -> list[dict[str, Any]]:
         external_knowledge_bindings = db.session.scalars(
             select(ExternalKnowledgeBindings).where(ExternalKnowledgeBindings.external_knowledge_api_id == self.id)
         ).all()
         dataset_ids = [binding.dataset_id for binding in external_knowledge_bindings]
         datasets = db.session.scalars(select(Dataset).where(Dataset.id.in_(dataset_ids))).all()
-        dataset_bindings: list[DatasetBindingItem] = []
+        dataset_bindings: list[dict[str, Any]] = []
         for dataset in datasets:
             dataset_bindings.append({"id": dataset.id, "name": dataset.name})
 

api/models/enums.py

@@ -11,13 +11,6 @@ class CreatorUserRole(StrEnum):
     ACCOUNT = "account"
     END_USER = "end_user"
 
-    @classmethod
-    def _missing_(cls, value):
-        if value == "end-user":
-            return cls.END_USER
-        else:
-            return super()._missing_(value)
-
 
 class WorkflowRunTriggeredFrom(StrEnum):
     DEBUGGING = "debugging"

api/models/trigger.py

@@ -3,7 +3,7 @@ import time
 from collections.abc import Mapping
 from datetime import datetime
 from functools import cached_property
-from typing import Any, TypedDict, cast
+from typing import Any, cast
 from uuid import uuid4
 
 import sqlalchemy as sa
@@ -23,47 +23,6 @@ from .enums import AppTriggerStatus, AppTriggerType, CreatorUserRole, WorkflowTr
 from .model import Account
 from .types import EnumText, LongText, StringUUID
 
-TriggerJsonObject = dict[str, object]
-TriggerCredentials = dict[str, str]
-
-
-class WorkflowTriggerLogDict(TypedDict):
-    id: str
-    tenant_id: str
-    app_id: str
-    workflow_id: str
-    workflow_run_id: str | None
-    root_node_id: str | None
-    trigger_metadata: Any
-    trigger_type: str
-    trigger_data: Any
-    inputs: Any
-    outputs: Any
-    status: str
-    error: str | None
-    queue_name: str
-    celery_task_id: str | None
-    retry_count: int
-    elapsed_time: float | None
-    total_tokens: int | None
-    created_by_role: str
-    created_by: str
-    created_at: str | None
-    triggered_at: str | None
-    finished_at: str | None
-
-
-class WorkflowSchedulePlanDict(TypedDict):
-    id: str
-    app_id: str
-    node_id: str
-    tenant_id: str
-    cron_expression: str
-    timezone: str
-    next_run_at: str | None
-    created_at: str
-    updated_at: str
-
 
 class TriggerSubscription(TypeBase):
     """
@@ -92,14 +51,10 @@ class TriggerSubscription(TypeBase):
         String(255), nullable=False, comment="Provider identifier (e.g., plugin_id/provider_name)"
     )
     endpoint_id: Mapped[str] = mapped_column(String(255), nullable=False, comment="Subscription endpoint")
-    parameters: Mapped[TriggerJsonObject] = mapped_column(
-        sa.JSON, nullable=False, comment="Subscription parameters JSON"
-    )
-    properties: Mapped[TriggerJsonObject] = mapped_column(
-        sa.JSON, nullable=False, comment="Subscription properties JSON"
-    )
+    parameters: Mapped[dict[str, Any]] = mapped_column(sa.JSON, nullable=False, comment="Subscription parameters JSON")
+    properties: Mapped[dict[str, Any]] = mapped_column(sa.JSON, nullable=False, comment="Subscription properties JSON")
 
-    credentials: Mapped[TriggerCredentials] = mapped_column(
+    credentials: Mapped[dict[str, Any]] = mapped_column(
         sa.JSON, nullable=False, comment="Subscription credentials JSON"
     )
     credential_type: Mapped[str] = mapped_column(String(50), nullable=False, comment="oauth or api_key")
@@ -207,8 +162,8 @@ class TriggerOAuthTenantClient(TypeBase):
     )
 
     @property
-    def oauth_params(self) -> Mapping[str, object]:
-        return cast(TriggerJsonObject, json.loads(self.encrypted_oauth_params or "{}"))
+    def oauth_params(self) -> Mapping[str, Any]:
+        return cast(Mapping[str, Any], json.loads(self.encrypted_oauth_params or "{}"))
 
 
 class WorkflowTriggerLog(TypeBase):
@@ -295,7 +250,7 @@ class WorkflowTriggerLog(TypeBase):
         created_by_role = CreatorUserRole(self.created_by_role)
         return db.session.get(EndUser, self.created_by) if created_by_role == CreatorUserRole.END_USER else None
 
-    def to_dict(self) -> WorkflowTriggerLogDict:
+    def to_dict(self) -> dict[str, Any]:
         """Convert to dictionary for API responses"""
         return {
             "id": self.id,
@@ -526,7 +481,7 @@ class WorkflowSchedulePlan(TypeBase):
         DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp(), init=False
     )
 
-    def to_dict(self) -> WorkflowSchedulePlanDict:
+    def to_dict(self) -> dict[str, Any]:
         """Convert to dictionary representation"""
         return {
             "id": self.id,

api/models/workflow.py

@@ -3,7 +3,7 @@ import logging
 from collections.abc import Generator, Mapping, Sequence
 from datetime import datetime
 from enum import StrEnum
-from typing import TYPE_CHECKING, Any, Optional, TypedDict, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
 from uuid import uuid4
 
 import sqlalchemy as sa
@@ -19,7 +19,7 @@ from sqlalchemy import (
     orm,
     select,
 )
-from sqlalchemy.orm import Mapped, mapped_column
+from sqlalchemy.orm import Mapped, declared_attr, mapped_column
 from typing_extensions import deprecated
 
 from core.trigger.constants import TRIGGER_INFO_METADATA_KEY, TRIGGER_PLUGIN_NODE_TYPE
@@ -33,7 +33,7 @@ from dify_graph.enums import BuiltinNodeTypes, NodeType, WorkflowExecutionStatus
 from dify_graph.file.constants import maybe_file_object
 from dify_graph.file.models import File
 from dify_graph.variables import utils as variable_utils
-from dify_graph.variables.variables import FloatVariable, IntegerVariable, RAGPipelineVariable, StringVariable
+from dify_graph.variables.variables import FloatVariable, IntegerVariable, StringVariable
 from extensions.ext_storage import Storage
 from factories.variable_factory import TypeMismatchError, build_segment_with_type
 from libs.datetime_utils import naive_utc_now
@@ -59,25 +59,6 @@ from .types import EnumText, LongText, StringUUID
 
 logger = logging.getLogger(__name__)
 
-SerializedWorkflowValue = dict[str, Any]
-SerializedWorkflowVariables = dict[str, SerializedWorkflowValue]
-
-
-class WorkflowContentDict(TypedDict):
-    graph: Mapping[str, Any]
-    features: dict[str, Any]
-    environment_variables: list[dict[str, Any]]
-    conversation_variables: list[dict[str, Any]]
-    rag_pipeline_variables: list[dict[str, Any]]
-
-
-class WorkflowRunSummaryDict(TypedDict):
-    id: str
-    status: str
-    triggered_from: str
-    elapsed_time: float
-    total_tokens: int
-
 
 class WorkflowType(StrEnum):
     """
@@ -408,7 +389,7 @@ class Workflow(Base):  # bug
 
     def rag_pipeline_user_input_form(self) -> list:
         # get user_input_form from start node
-        variables: list[SerializedWorkflowValue] = self.rag_pipeline_variables
+        variables: list[Any] = self.rag_pipeline_variables
 
         return variables
 
@@ -451,13 +432,17 @@ class Workflow(Base):  # bug
     def environment_variables(
         self,
     ) -> Sequence[StringVariable | IntegerVariable | FloatVariable | SecretVariable]:
+        # TODO: find some way to init `self._environment_variables` when instance created.
+        if self._environment_variables is None:
+            self._environment_variables = "{}"
+
         # Use workflow.tenant_id to avoid relying on request user in background threads
         tenant_id = self.tenant_id
 
         if not tenant_id:
             return []
 
-        environment_variables_dict = cast(SerializedWorkflowVariables, json.loads(self._environment_variables or "{}"))
+        environment_variables_dict: dict[str, Any] = json.loads(self._environment_variables or "{}")
         results = [
             variable_factory.build_environment_variable_from_mapping(v) for v in environment_variables_dict.values()
         ]
@@ -517,14 +502,14 @@ class Workflow(Base):  # bug
         )
         self._environment_variables = environment_variables_json
 
-    def to_dict(self, *, include_secret: bool = False) -> WorkflowContentDict:
+    def to_dict(self, *, include_secret: bool = False) -> Mapping[str, Any]:
         environment_variables = list(self.environment_variables)
         environment_variables = [
             v if not isinstance(v, SecretVariable) or include_secret else v.model_copy(update={"value": ""})
             for v in environment_variables
         ]
 
-        result: WorkflowContentDict = {
+        result = {
             "graph": self.graph_dict,
             "features": self.features_dict,
             "environment_variables": [var.model_dump(mode="json") for var in environment_variables],
@@ -535,7 +520,11 @@ class Workflow(Base):  # bug
 
     @property
     def conversation_variables(self) -> Sequence[VariableBase]:
-        variables_dict = cast(SerializedWorkflowVariables, json.loads(self._conversation_variables or "{}"))
+        # TODO: find some way to init `self._conversation_variables` when instance created.
+        if self._conversation_variables is None:
+            self._conversation_variables = "{}"
+
+        variables_dict: dict[str, Any] = json.loads(self._conversation_variables)
         results = [variable_factory.build_conversation_variable_from_mapping(v) for v in variables_dict.values()]
         return results
 
@@ -547,20 +536,19 @@ class Workflow(Base):  # bug
         )
 
     @property
-    def rag_pipeline_variables(self) -> list[SerializedWorkflowValue]:
-        variables_dict = cast(SerializedWorkflowVariables, json.loads(self._rag_pipeline_variables or "{}"))
-        return [RAGPipelineVariable.model_validate(item).model_dump(mode="json") for item in variables_dict.values()]
+    def rag_pipeline_variables(self) -> list[dict]:
+        # TODO: find some way to init `self._conversation_variables` when instance created.
+        if self._rag_pipeline_variables is None:
+            self._rag_pipeline_variables = "{}"
+
+        variables_dict: dict[str, Any] = json.loads(self._rag_pipeline_variables)
+        results = list(variables_dict.values())
+        return results
 
     @rag_pipeline_variables.setter
-    def rag_pipeline_variables(self, values: Sequence[Mapping[str, Any] | RAGPipelineVariable]) -> None:
+    def rag_pipeline_variables(self, values: list[dict]) -> None:
         self._rag_pipeline_variables = json.dumps(
-            {
-                rag_pipeline_variable.variable: rag_pipeline_variable.model_dump(mode="json")
-                for rag_pipeline_variable in (
-                    item if isinstance(item, RAGPipelineVariable) else RAGPipelineVariable.model_validate(item)
-                    for item in values
-                )
-            },
+            {item["variable"]: item for item in values},
             ensure_ascii=False,
         )
 
@@ -798,36 +786,44 @@ class WorkflowNodeExecutionModel(Base):  # This model is expected to have `offlo
 
     __tablename__ = "workflow_node_executions"
 
-    __table_args__ = (
-        PrimaryKeyConstraint("id", name="workflow_node_execution_pkey"),
-        Index(
-            "workflow_node_execution_workflow_run_id_idx",
-            "workflow_run_id",
-        ),
-        Index(
-            "workflow_node_execution_node_run_idx",
-            "tenant_id",
-            "app_id",
-            "workflow_id",
-            "triggered_from",
-            "node_id",
-        ),
-        Index(
-            "workflow_node_execution_id_idx",
-            "tenant_id",
-            "app_id",
-            "workflow_id",
-            "triggered_from",
-            "node_execution_id",
-        ),
-        Index(
-            None,
-            "tenant_id",
-            "workflow_id",
-            "node_id",
-            sa.desc("created_at"),
-        ),
-    )
+    @declared_attr.directive
+    @classmethod
+    def __table_args__(cls) -> Any:
+        return (
+            PrimaryKeyConstraint("id", name="workflow_node_execution_pkey"),
+            Index(
+                "workflow_node_execution_workflow_run_id_idx",
+                "workflow_run_id",
+            ),
+            Index(
+                "workflow_node_execution_node_run_idx",
+                "tenant_id",
+                "app_id",
+                "workflow_id",
+                "triggered_from",
+                "node_id",
+            ),
+            Index(
+                "workflow_node_execution_id_idx",
+                "tenant_id",
+                "app_id",
+                "workflow_id",
+                "triggered_from",
+                "node_execution_id",
+            ),
+            Index(
+                # The first argument is the index name,
+                # which we leave as `None`` to allow auto-generation by the ORM.
+                None,
+                cls.tenant_id,
+                cls.workflow_id,
+                cls.node_id,
+                # MyPy may flag the following line because it doesn't recognize that
+                # the `declared_attr` decorator passes the receiving class as the first
+                # argument to this method, allowing us to reference class attributes.
+                cls.created_at.desc(),
+            ),
+        )
 
     id: Mapped[str] = mapped_column(StringUUID, default=lambda: str(uuid4()))
     tenant_id: Mapped[str] = mapped_column(StringUUID)
@@ -1235,7 +1231,7 @@ class WorkflowArchiveLog(TypeBase):
     )
 
     @property
-    def workflow_run_summary(self) -> WorkflowRunSummaryDict:
+    def workflow_run_summary(self) -> dict[str, Any]:
         return {
             "id": self.workflow_run_id,
             "status": self.run_status,
@@ -1290,17 +1286,16 @@ class WorkflowDraftVariable(Base):
     """
 
     @staticmethod
-    def unique_app_id_user_id_node_id_name() -> list[str]:
+    def unique_app_id_node_id_name() -> list[str]:
         return [
             "app_id",
-            "user_id",
             "node_id",
             "name",
         ]
 
     __tablename__ = "workflow_draft_variables"
     __table_args__ = (
-        UniqueConstraint(*unique_app_id_user_id_node_id_name()),
+        UniqueConstraint(*unique_app_id_node_id_name()),
         Index("workflow_draft_variable_file_id_idx", "file_id"),
     )
     # Required for instance variable annotation.
@@ -1326,11 +1321,6 @@ class WorkflowDraftVariable(Base):
 
     # "`app_id` maps to the `id` field in the `model.App` model."
     app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    # Owner of this draft variable.
-    #
-    # This field is nullable during migration and will be migrated to NOT NULL
-    # in a follow-up release.
-    user_id: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
 
     # `last_edited_at` records when the value of a given draft variable
     # is edited.
@@ -1583,7 +1573,6 @@ class WorkflowDraftVariable(Base):
         cls,
         *,
         app_id: str,
-        user_id: str | None,
         node_id: str,
         name: str,
         value: Segment,
@@ -1597,7 +1586,6 @@ class WorkflowDraftVariable(Base):
         variable.updated_at = naive_utc_now()
         variable.description = description
         variable.app_id = app_id
-        variable.user_id = user_id
         variable.node_id = node_id
         variable.name = name
         variable.set_value(value)
@@ -1611,14 +1599,12 @@ class WorkflowDraftVariable(Base):
         cls,
         *,
         app_id: str,
-        user_id: str | None = None,
         name: str,
         value: Segment,
         description: str = "",
     ) -> "WorkflowDraftVariable":
         variable = cls._new(
             app_id=app_id,
-            user_id=user_id,
             node_id=CONVERSATION_VARIABLE_NODE_ID,
             name=name,
             value=value,
@@ -1633,7 +1619,6 @@ class WorkflowDraftVariable(Base):
         cls,
         *,
         app_id: str,
-        user_id: str | None = None,
         name: str,
         value: Segment,
         node_execution_id: str,
@@ -1641,7 +1626,6 @@ class WorkflowDraftVariable(Base):
     ) -> "WorkflowDraftVariable":
         variable = cls._new(
             app_id=app_id,
-            user_id=user_id,
             node_id=SYSTEM_VARIABLE_NODE_ID,
             name=name,
             node_execution_id=node_execution_id,
@@ -1655,7 +1639,6 @@ class WorkflowDraftVariable(Base):
         cls,
         *,
         app_id: str,
-        user_id: str | None = None,
         node_id: str,
         name: str,
         value: Segment,
@@ -1666,7 +1649,6 @@ class WorkflowDraftVariable(Base):
     ) -> "WorkflowDraftVariable":
         variable = cls._new(
             app_id=app_id,
-            user_id=user_id,
             node_id=node_id,
             name=name,
             node_execution_id=node_execution_id,

api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dify-api"
-version = "1.13.2"
+version = "1.13.0"
 requires-python = ">=3.11,<3.13"
 
 dependencies = [
@@ -40,7 +40,7 @@ dependencies = [
     "numpy~=1.26.4",
     "openpyxl~=3.1.5",
     "opik~=1.10.37",
-    "litellm==1.82.2",                                    # Pinned to avoid madoka dependency issue
+    "litellm==1.82.2",                                  # Pinned to avoid madoka dependency issue
     "opentelemetry-api==1.28.0",
     "opentelemetry-distro==0.49b0",
     "opentelemetry-exporter-otlp==1.28.0",
@@ -91,7 +91,6 @@ dependencies = [
     "apscheduler>=3.11.0",
     "weave>=0.52.16",
     "fastopenapi[flask]>=0.7.0",
-    "bleach~=6.2.0",
 ]
 # Before adding new dependency, consider place it in
 # alphabet order (a-z) and suitable group.
@@ -119,7 +118,7 @@ dev = [
     "pytest~=9.0.2",
     "pytest-benchmark~=5.2.3",
     "pytest-cov~=7.0.0",
-    "pytest-env~=1.6.0",
+    "pytest-env~=1.1.3",
     "pytest-mock~=3.15.1",
     "testcontainers~=4.14.1",
     "types-aiofiles~=25.1.0",
@@ -252,7 +251,10 @@ ignore_errors = true
 
 [tool.pyrefly]
 project-includes = ["."]
-project-excludes = [".venv", "migrations/"]
+project-excludes = [
+    ".venv",
+    "migrations/",
+]
 python-platform = "linux"
 python-version = "3.11.0"
 infer-with-first-use = false

api/pyrefly-local-excludes.txt

@@ -1,3 +1,4 @@
+configs/middleware/cache/redis_pubsub_config.py
 controllers/console/app/annotation.py
 controllers/console/app/app.py
 controllers/console/app/app_import.py
@@ -137,6 +138,8 @@ dify_graph/nodes/trigger_webhook/node.py
 dify_graph/nodes/variable_aggregator/variable_aggregator_node.py
 dify_graph/nodes/variable_assigner/v1/node.py
 dify_graph/nodes/variable_assigner/v2/node.py
+dify_graph/variables/types.py
+extensions/ext_fastopenapi.py
 extensions/logstore/repositories/logstore_api_workflow_run_repository.py
 extensions/otel/instrumentation.py
 extensions/otel/runtime.py
@@ -153,7 +156,19 @@ extensions/storage/oracle_oci_storage.py
 extensions/storage/supabase_storage.py
 extensions/storage/tencent_cos_storage.py
 extensions/storage/volcengine_tos_storage.py
+factories/variable_factory.py
+libs/external_api.py
 libs/gmpy2_pkcs10aep_cipher.py
+libs/helper.py
+libs/login.py
+libs/module_loading.py
+libs/oauth.py
+libs/oauth_data_source.py
+models/trigger.py
+models/workflow.py
+repositories/sqlalchemy_api_workflow_node_execution_repository.py
+repositories/sqlalchemy_api_workflow_run_repository.py
+repositories/sqlalchemy_execution_extra_content_repository.py
 schedule/queue_monitor_task.py
 services/account_service.py
 services/audio_service.py

api/repositories/sqlalchemy_api_workflow_node_execution_repository.py

@@ -8,7 +8,7 @@ using SQLAlchemy 2.0 style queries for WorkflowNodeExecutionModel operations.
 import json
 from collections.abc import Sequence
 from datetime import datetime
-from typing import Protocol, cast
+from typing import cast
 
 from sqlalchemy import asc, delete, desc, func, select
 from sqlalchemy.engine import CursorResult
@@ -22,20 +22,6 @@ from repositories.api_workflow_node_execution_repository import (
 )
 
 
-class _WorkflowNodeExecutionSnapshotRow(Protocol):
-    id: str
-    node_execution_id: str | None
-    node_id: str
-    node_type: str
-    title: str
-    index: int
-    status: WorkflowNodeExecutionStatus
-    elapsed_time: float | None
-    created_at: datetime
-    finished_at: datetime | None
-    execution_metadata: str | None
-
-
 class DifyAPISQLAlchemyWorkflowNodeExecutionRepository(DifyAPIWorkflowNodeExecutionRepository):
     """
     SQLAlchemy implementation of DifyAPIWorkflowNodeExecutionRepository.
@@ -54,8 +40,6 @@ class DifyAPISQLAlchemyWorkflowNodeExecutionRepository(DifyAPIWorkflowNodeExecut
     - Thread-safe database operations using session-per-request pattern
     """
 
-    _session_maker: sessionmaker[Session]
-
     def __init__(self, session_maker: sessionmaker[Session]):
         """
         Initialize the repository with a sessionmaker.
@@ -172,12 +156,12 @@ class DifyAPISQLAlchemyWorkflowNodeExecutionRepository(DifyAPIWorkflowNodeExecut
         )
 
         with self._session_maker() as session:
-            rows = cast(Sequence[_WorkflowNodeExecutionSnapshotRow], session.execute(stmt).all())
+            rows = session.execute(stmt).all()
 
         return [self._row_to_snapshot(row) for row in rows]
 
     @staticmethod
-    def _row_to_snapshot(row: _WorkflowNodeExecutionSnapshotRow) -> WorkflowNodeExecutionSnapshot:
+    def _row_to_snapshot(row: object) -> WorkflowNodeExecutionSnapshot:
         metadata: dict[str, object] = {}
         execution_metadata = getattr(row, "execution_metadata", None)
         if execution_metadata:

api/services/app_dsl_service.py

@@ -304,7 +304,7 @@ class AppDslService:
             )
 
             draft_var_srv = WorkflowDraftVariableService(session=self._session)
-            draft_var_srv.delete_app_workflow_variables(app_id=app.id)
+            draft_var_srv.delete_workflow_variables(app_id=app.id)
             return Import(
                 id=import_id,
                 status=status,

api/services/async_workflow_service.py

@@ -18,7 +18,7 @@ from extensions.ext_database import db
 from models.account import Account
 from models.enums import CreatorUserRole, WorkflowTriggerStatus
 from models.model import App, EndUser
-from models.trigger import WorkflowTriggerLog, WorkflowTriggerLogDict
+from models.trigger import WorkflowTriggerLog
 from models.workflow import Workflow
 from repositories.sqlalchemy_workflow_trigger_log_repository import SQLAlchemyWorkflowTriggerLogRepository
 from services.errors.app import QuotaExceededError, WorkflowNotFoundError, WorkflowQuotaLimitError
@@ -224,9 +224,7 @@ class AsyncWorkflowService:
         return cls.trigger_workflow_async(session, user, trigger_data)
 
     @classmethod
-    def get_trigger_log(
-        cls, workflow_trigger_log_id: str, tenant_id: str | None = None
-    ) -> WorkflowTriggerLogDict | None:
+    def get_trigger_log(cls, workflow_trigger_log_id: str, tenant_id: str | None = None) -> dict[str, Any] | None:
         """
         Get trigger log by ID
 
@@ -249,7 +247,7 @@ class AsyncWorkflowService:
     @classmethod
     def get_recent_logs(
         cls, tenant_id: str, app_id: str, hours: int = 24, limit: int = 100, offset: int = 0
-    ) -> list[WorkflowTriggerLogDict]:
+    ) -> list[dict[str, Any]]:
         """
         Get recent trigger logs
 
@@ -274,7 +272,7 @@ class AsyncWorkflowService:
     @classmethod
     def get_failed_logs_for_retry(
         cls, tenant_id: str, max_retry_count: int = 3, limit: int = 100
-    ) -> list[WorkflowTriggerLogDict]:
+    ) -> list[dict[str, Any]]:
         """
         Get failed logs eligible for retry
 

api/services/human_input_delivery_test_service.py

@@ -155,15 +155,13 @@ class EmailDeliveryTestHandler:
                 context=context,
                 recipient_email=recipient_email,
             )
-            subject_template = render_email_template(method.config.subject, substitutions)
-            subject = EmailDeliveryConfig.sanitize_subject(subject_template)
+            subject = render_email_template(method.config.subject, substitutions)
             templated_body = EmailDeliveryConfig.render_body_template(
                 body=method.config.body,
                 url=substitutions.get("form_link"),
                 variable_pool=context.variable_pool,
             )
             body = render_email_template(templated_body, substitutions)
-            body = EmailDeliveryConfig.render_markdown_body(body)
 
             mail.send(
                 to=recipient_email,

api/services/plugin/plugin_service.py

@@ -30,7 +30,7 @@ from core.plugin.impl.debugging import PluginDebuggingClient
 from core.plugin.impl.plugin import PluginInstaller
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
-from models.provider import Provider, ProviderCredential, TenantPreferredModelProvider
+from models.provider import Provider, ProviderCredential
 from models.provider_ids import GenericProviderID
 from services.enterprise.plugin_manager_service import (
     PluginManagerService,
@@ -534,13 +534,6 @@ class PluginService:
             plugin_id = plugin.plugin_id
             logger.info("Deleting credentials for plugin: %s", plugin_id)
 
-            session.execute(
-                delete(TenantPreferredModelProvider).where(
-                    TenantPreferredModelProvider.tenant_id == tenant_id,
-                    TenantPreferredModelProvider.provider_name.like(f"{plugin_id}/%"),
-                )
-            )
-
             # Delete provider credentials that match this plugin
             credential_ids = session.scalars(
                 select(ProviderCredential.id).where(

api/services/rag_pipeline/rag_pipeline.py

@@ -472,7 +472,6 @@ class RagPipelineService:
                     engine=db.engine,
                     app_id=pipeline.id,
                     tenant_id=pipeline.tenant_id,
-                    user_id=account.id,
                 ),
             ),
             start_at=start_at,
@@ -1238,7 +1237,6 @@ class RagPipelineService:
                     engine=db.engine,
                     app_id=pipeline.id,
                     tenant_id=pipeline.tenant_id,
-                    user_id=current_user.id,
                 ),
             ),
             start_at=start_at,

api/services/retention/conversation/messages_clean_service.py

@@ -1,16 +1,16 @@
 import datetime
 import logging
+import os
 import random
 import time
 from collections.abc import Sequence
-from typing import TYPE_CHECKING, cast
+from typing import cast
 
 import sqlalchemy as sa
 from sqlalchemy import delete, select, tuple_
 from sqlalchemy.engine import CursorResult
 from sqlalchemy.orm import Session
 
-from configs import dify_config
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from models.model import (
@@ -33,131 +33,6 @@ from services.retention.conversation.messages_clean_policy import (
 logger = logging.getLogger(__name__)
 
 
-if TYPE_CHECKING:
-    from opentelemetry.metrics import Counter, Histogram
-
-
-class MessagesCleanupMetrics:
-    """
-    Records low-cardinality OpenTelemetry metrics for expired message cleanup jobs.
-
-    We keep labels stable (dry_run/window_mode/task_label/status) so these metrics remain
-    dashboard-friendly for long-running CronJob executions.
-    """
-
-    _job_runs_total: "Counter | None"
-    _batches_total: "Counter | None"
-    _messages_scanned_total: "Counter | None"
-    _messages_filtered_total: "Counter | None"
-    _messages_deleted_total: "Counter | None"
-    _job_duration_seconds: "Histogram | None"
-    _batch_duration_seconds: "Histogram | None"
-    _base_attributes: dict[str, str]
-
-    def __init__(self, *, dry_run: bool, has_window: bool, task_label: str) -> None:
-        self._job_runs_total = None
-        self._batches_total = None
-        self._messages_scanned_total = None
-        self._messages_filtered_total = None
-        self._messages_deleted_total = None
-        self._job_duration_seconds = None
-        self._batch_duration_seconds = None
-        self._base_attributes = {
-            "job_name": "messages_cleanup",
-            "dry_run": str(dry_run).lower(),
-            "window_mode": "between" if has_window else "before_cutoff",
-            "task_label": task_label,
-        }
-        self._init_instruments()
-
-    def _init_instruments(self) -> None:
-        if not dify_config.ENABLE_OTEL:
-            return
-
-        try:
-            from opentelemetry.metrics import get_meter
-
-            meter = get_meter("messages_cleanup", version=dify_config.project.version)
-            self._job_runs_total = meter.create_counter(
-                "messages_cleanup_jobs_total",
-                description="Total number of expired message cleanup jobs by status.",
-                unit="{job}",
-            )
-            self._batches_total = meter.create_counter(
-                "messages_cleanup_batches_total",
-                description="Total number of message cleanup batches processed.",
-                unit="{batch}",
-            )
-            self._messages_scanned_total = meter.create_counter(
-                "messages_cleanup_scanned_messages_total",
-                description="Total messages scanned by cleanup jobs.",
-                unit="{message}",
-            )
-            self._messages_filtered_total = meter.create_counter(
-                "messages_cleanup_filtered_messages_total",
-                description="Total messages selected by cleanup policy.",
-                unit="{message}",
-            )
-            self._messages_deleted_total = meter.create_counter(
-                "messages_cleanup_deleted_messages_total",
-                description="Total messages deleted by cleanup jobs.",
-                unit="{message}",
-            )
-            self._job_duration_seconds = meter.create_histogram(
-                "messages_cleanup_job_duration_seconds",
-                description="Duration of expired message cleanup jobs in seconds.",
-                unit="s",
-            )
-            self._batch_duration_seconds = meter.create_histogram(
-                "messages_cleanup_batch_duration_seconds",
-                description="Duration of expired message cleanup batch processing in seconds.",
-                unit="s",
-            )
-        except Exception:
-            logger.exception("messages_cleanup_metrics: failed to initialize instruments")
-
-    def _attrs(self, **extra: str) -> dict[str, str]:
-        return {**self._base_attributes, **extra}
-
-    @staticmethod
-    def _add(counter: "Counter | None", value: int, attributes: dict[str, str]) -> None:
-        if not counter or value <= 0:
-            return
-        try:
-            counter.add(value, attributes)
-        except Exception:
-            logger.exception("messages_cleanup_metrics: failed to add counter value")
-
-    @staticmethod
-    def _record(histogram: "Histogram | None", value: float, attributes: dict[str, str]) -> None:
-        if not histogram:
-            return
-        try:
-            histogram.record(value, attributes)
-        except Exception:
-            logger.exception("messages_cleanup_metrics: failed to record histogram value")
-
-    def record_batch(
-        self,
-        *,
-        scanned_messages: int,
-        filtered_messages: int,
-        deleted_messages: int,
-        batch_duration_seconds: float,
-    ) -> None:
-        attributes = self._attrs()
-        self._add(self._batches_total, 1, attributes)
-        self._add(self._messages_scanned_total, scanned_messages, attributes)
-        self._add(self._messages_filtered_total, filtered_messages, attributes)
-        self._add(self._messages_deleted_total, deleted_messages, attributes)
-        self._record(self._batch_duration_seconds, batch_duration_seconds, attributes)
-
-    def record_completion(self, *, status: str, job_duration_seconds: float) -> None:
-        attributes = self._attrs(status=status)
-        self._add(self._job_runs_total, 1, attributes)
-        self._record(self._job_duration_seconds, job_duration_seconds, attributes)
-
-
 class MessagesCleanService:
     """
     Service for cleaning expired messages based on retention policies.
@@ -173,7 +48,6 @@ class MessagesCleanService:
         start_from: datetime.datetime | None = None,
         batch_size: int = 1000,
         dry_run: bool = False,
-        task_label: str = "custom",
     ) -> None:
         """
         Initialize the service with cleanup parameters.
@@ -184,18 +58,12 @@ class MessagesCleanService:
             start_from: Optional start time (inclusive) of the range
             batch_size: Number of messages to process per batch
             dry_run: Whether to perform a dry run (no actual deletion)
-            task_label: Optional task label for retention metrics
         """
         self._policy = policy
         self._end_before = end_before
         self._start_from = start_from
         self._batch_size = batch_size
         self._dry_run = dry_run
-        self._metrics = MessagesCleanupMetrics(
-            dry_run=dry_run,
-            has_window=bool(start_from),
-            task_label=task_label,
-        )
 
     @classmethod
     def from_time_range(
@@ -205,7 +73,6 @@ class MessagesCleanService:
         end_before: datetime.datetime,
         batch_size: int = 1000,
         dry_run: bool = False,
-        task_label: str = "custom",
     ) -> "MessagesCleanService":
         """
         Create a service instance for cleaning messages within a specific time range.
@@ -218,7 +85,6 @@ class MessagesCleanService:
             end_before: End time (exclusive) of the range
             batch_size: Number of messages to process per batch
             dry_run: Whether to perform a dry run (no actual deletion)
-            task_label: Optional task label for retention metrics
 
         Returns:
             MessagesCleanService instance
@@ -246,7 +112,6 @@ class MessagesCleanService:
             start_from=start_from,
             batch_size=batch_size,
             dry_run=dry_run,
-            task_label=task_label,
         )
 
     @classmethod
@@ -256,7 +121,6 @@ class MessagesCleanService:
         days: int = 30,
         batch_size: int = 1000,
         dry_run: bool = False,
-        task_label: str = "custom",
     ) -> "MessagesCleanService":
         """
         Create a service instance for cleaning messages older than specified days.
@@ -266,7 +130,6 @@ class MessagesCleanService:
             days: Number of days to look back from now
             batch_size: Number of messages to process per batch
             dry_run: Whether to perform a dry run (no actual deletion)
-            task_label: Optional task label for retention metrics
 
         Returns:
             MessagesCleanService instance
@@ -290,14 +153,7 @@ class MessagesCleanService:
             policy.__class__.__name__,
         )
 
-        return cls(
-            policy=policy,
-            end_before=end_before,
-            start_from=None,
-            batch_size=batch_size,
-            dry_run=dry_run,
-            task_label=task_label,
-        )
+        return cls(policy=policy, end_before=end_before, start_from=None, batch_size=batch_size, dry_run=dry_run)
 
     def run(self) -> dict[str, int]:
         """
@@ -306,18 +162,7 @@ class MessagesCleanService:
         Returns:
             Dict with statistics: batches, filtered_messages, total_deleted
         """
-        status = "success"
-        run_start = time.monotonic()
-        try:
-            return self._clean_messages_by_time_range()
-        except Exception:
-            status = "failed"
-            raise
-        finally:
-            self._metrics.record_completion(
-                status=status,
-                job_duration_seconds=time.monotonic() - run_start,
-            )
+        return self._clean_messages_by_time_range()
 
     def _clean_messages_by_time_range(self) -> dict[str, int]:
         """
@@ -352,14 +197,11 @@ class MessagesCleanService:
             self._end_before,
         )
 
-        max_batch_interval_ms = dify_config.SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL
+        max_batch_interval_ms = int(os.environ.get("SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL", 200))
 
         while True:
             stats["batches"] += 1
             batch_start = time.monotonic()
-            batch_scanned_messages = 0
-            batch_filtered_messages = 0
-            batch_deleted_messages = 0
 
             # Step 1: Fetch a batch of messages using cursor
             with Session(db.engine, expire_on_commit=False) as session:
@@ -398,16 +240,9 @@ class MessagesCleanService:
 
                 # Track total messages fetched across all batches
                 stats["total_messages"] += len(messages)
-                batch_scanned_messages = len(messages)
 
                 if not messages:
                     logger.info("clean_messages (batch %s): no more messages to process", stats["batches"])
-                    self._metrics.record_batch(
-                        scanned_messages=batch_scanned_messages,
-                        filtered_messages=batch_filtered_messages,
-                        deleted_messages=batch_deleted_messages,
-                        batch_duration_seconds=time.monotonic() - batch_start,
-                    )
                     break
 
                 # Update cursor to the last message's (created_at, id)
@@ -433,12 +268,6 @@ class MessagesCleanService:
 
             if not apps:
                 logger.info("clean_messages (batch %s): no apps found, skip", stats["batches"])
-                self._metrics.record_batch(
-                    scanned_messages=batch_scanned_messages,
-                    filtered_messages=batch_filtered_messages,
-                    deleted_messages=batch_deleted_messages,
-                    batch_duration_seconds=time.monotonic() - batch_start,
-                )
                 continue
 
             # Build app_id -> tenant_id mapping
@@ -457,16 +286,9 @@ class MessagesCleanService:
 
             if not message_ids_to_delete:
                 logger.info("clean_messages (batch %s): no messages to delete, skip", stats["batches"])
-                self._metrics.record_batch(
-                    scanned_messages=batch_scanned_messages,
-                    filtered_messages=batch_filtered_messages,
-                    deleted_messages=batch_deleted_messages,
-                    batch_duration_seconds=time.monotonic() - batch_start,
-                )
                 continue
 
             stats["filtered_messages"] += len(message_ids_to_delete)
-            batch_filtered_messages = len(message_ids_to_delete)
 
             # Step 4: Batch delete messages and their relations
             if not self._dry_run:
@@ -487,7 +309,6 @@ class MessagesCleanService:
                     commit_ms = int((time.monotonic() - commit_start) * 1000)
 
                     stats["total_deleted"] += messages_deleted
-                    batch_deleted_messages = messages_deleted
 
                     logger.info(
                         "clean_messages (batch %s): processed %s messages, deleted %s messages",
@@ -522,13 +343,6 @@ class MessagesCleanService:
                 for msg_id in sampled_ids:
                     logger.info("clean_messages (batch %s, dry_run) sample: message_id=%s", stats["batches"], msg_id)
 
-            self._metrics.record_batch(
-                scanned_messages=batch_scanned_messages,
-                filtered_messages=batch_filtered_messages,
-                deleted_messages=batch_deleted_messages,
-                batch_duration_seconds=time.monotonic() - batch_start,
-            )
-
         logger.info(
             "clean_messages completed: total batches: %s, total messages: %s, filtered messages: %s, total deleted: %s",
             stats["batches"],

api/services/retention/workflow_run/clear_free_plan_expired_workflow_run_logs.py

@@ -1,9 +1,9 @@
 import datetime
 import logging
+import os
 import random
 import time
 from collections.abc import Iterable, Sequence
-from typing import TYPE_CHECKING
 
 import click
 from sqlalchemy.orm import Session, sessionmaker
@@ -20,159 +20,6 @@ from services.billing_service import BillingService, SubscriptionPlan
 logger = logging.getLogger(__name__)
 
 
-if TYPE_CHECKING:
-    from opentelemetry.metrics import Counter, Histogram
-
-
-class WorkflowRunCleanupMetrics:
-    """
-    Records low-cardinality OpenTelemetry metrics for workflow run cleanup jobs.
-
-    Metrics are emitted with stable labels only (dry_run/window_mode/task_label/status)
-    to keep dashboard and alert cardinality predictable in production clusters.
-    """
-
-    _job_runs_total: "Counter | None"
-    _batches_total: "Counter | None"
-    _runs_scanned_total: "Counter | None"
-    _runs_targeted_total: "Counter | None"
-    _runs_deleted_total: "Counter | None"
-    _runs_skipped_total: "Counter | None"
-    _related_records_total: "Counter | None"
-    _job_duration_seconds: "Histogram | None"
-    _batch_duration_seconds: "Histogram | None"
-    _base_attributes: dict[str, str]
-
-    def __init__(self, *, dry_run: bool, has_window: bool, task_label: str) -> None:
-        self._job_runs_total = None
-        self._batches_total = None
-        self._runs_scanned_total = None
-        self._runs_targeted_total = None
-        self._runs_deleted_total = None
-        self._runs_skipped_total = None
-        self._related_records_total = None
-        self._job_duration_seconds = None
-        self._batch_duration_seconds = None
-        self._base_attributes = {
-            "job_name": "workflow_run_cleanup",
-            "dry_run": str(dry_run).lower(),
-            "window_mode": "between" if has_window else "before_cutoff",
-            "task_label": task_label,
-        }
-        self._init_instruments()
-
-    def _init_instruments(self) -> None:
-        if not dify_config.ENABLE_OTEL:
-            return
-
-        try:
-            from opentelemetry.metrics import get_meter
-
-            meter = get_meter("workflow_run_cleanup", version=dify_config.project.version)
-            self._job_runs_total = meter.create_counter(
-                "workflow_run_cleanup_jobs_total",
-                description="Total number of workflow run cleanup jobs by status.",
-                unit="{job}",
-            )
-            self._batches_total = meter.create_counter(
-                "workflow_run_cleanup_batches_total",
-                description="Total number of processed cleanup batches.",
-                unit="{batch}",
-            )
-            self._runs_scanned_total = meter.create_counter(
-                "workflow_run_cleanup_scanned_runs_total",
-                description="Total workflow runs scanned by cleanup jobs.",
-                unit="{run}",
-            )
-            self._runs_targeted_total = meter.create_counter(
-                "workflow_run_cleanup_targeted_runs_total",
-                description="Total workflow runs targeted by cleanup policy.",
-                unit="{run}",
-            )
-            self._runs_deleted_total = meter.create_counter(
-                "workflow_run_cleanup_deleted_runs_total",
-                description="Total workflow runs deleted by cleanup jobs.",
-                unit="{run}",
-            )
-            self._runs_skipped_total = meter.create_counter(
-                "workflow_run_cleanup_skipped_runs_total",
-                description="Total workflow runs skipped because tenant is paid/unknown.",
-                unit="{run}",
-            )
-            self._related_records_total = meter.create_counter(
-                "workflow_run_cleanup_related_records_total",
-                description="Total related records processed by cleanup jobs.",
-                unit="{record}",
-            )
-            self._job_duration_seconds = meter.create_histogram(
-                "workflow_run_cleanup_job_duration_seconds",
-                description="Duration of workflow run cleanup jobs in seconds.",
-                unit="s",
-            )
-            self._batch_duration_seconds = meter.create_histogram(
-                "workflow_run_cleanup_batch_duration_seconds",
-                description="Duration of workflow run cleanup batch processing in seconds.",
-                unit="s",
-            )
-        except Exception:
-            logger.exception("workflow_run_cleanup_metrics: failed to initialize instruments")
-
-    def _attrs(self, **extra: str) -> dict[str, str]:
-        return {**self._base_attributes, **extra}
-
-    @staticmethod
-    def _add(counter: "Counter | None", value: int, attributes: dict[str, str]) -> None:
-        if not counter or value <= 0:
-            return
-        try:
-            counter.add(value, attributes)
-        except Exception:
-            logger.exception("workflow_run_cleanup_metrics: failed to add counter value")
-
-    @staticmethod
-    def _record(histogram: "Histogram | None", value: float, attributes: dict[str, str]) -> None:
-        if not histogram:
-            return
-        try:
-            histogram.record(value, attributes)
-        except Exception:
-            logger.exception("workflow_run_cleanup_metrics: failed to record histogram value")
-
-    def record_batch(
-        self,
-        *,
-        batch_rows: int,
-        targeted_runs: int,
-        skipped_runs: int,
-        deleted_runs: int,
-        related_counts: dict[str, int] | None,
-        related_action: str | None,
-        batch_duration_seconds: float,
-    ) -> None:
-        attributes = self._attrs()
-        self._add(self._batches_total, 1, attributes)
-        self._add(self._runs_scanned_total, batch_rows, attributes)
-        self._add(self._runs_targeted_total, targeted_runs, attributes)
-        self._add(self._runs_skipped_total, skipped_runs, attributes)
-        self._add(self._runs_deleted_total, deleted_runs, attributes)
-        self._record(self._batch_duration_seconds, batch_duration_seconds, attributes)
-
-        if not related_counts or not related_action:
-            return
-
-        for record_type, count in related_counts.items():
-            self._add(
-                self._related_records_total,
-                count,
-                self._attrs(action=related_action, record_type=record_type),
-            )
-
-    def record_completion(self, *, status: str, job_duration_seconds: float) -> None:
-        attributes = self._attrs(status=status)
-        self._add(self._job_runs_total, 1, attributes)
-        self._record(self._job_duration_seconds, job_duration_seconds, attributes)
-
-
 class WorkflowRunCleanup:
     def __init__(
         self,
@@ -182,7 +29,6 @@ class WorkflowRunCleanup:
         end_before: datetime.datetime | None = None,
         workflow_run_repo: APIWorkflowRunRepository | None = None,
         dry_run: bool = False,
-        task_label: str = "custom",
     ):
         if (start_from is None) ^ (end_before is None):
             raise ValueError("start_from and end_before must be both set or both omitted.")
@@ -200,11 +46,6 @@ class WorkflowRunCleanup:
         self.batch_size = batch_size
         self._cleanup_whitelist: set[str] | None = None
         self.dry_run = dry_run
-        self._metrics = WorkflowRunCleanupMetrics(
-            dry_run=dry_run,
-            has_window=bool(start_from),
-            task_label=task_label,
-        )
         self.free_plan_grace_period_days = dify_config.SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD
         self.workflow_run_repo: APIWorkflowRunRepository
         if workflow_run_repo:
@@ -233,193 +74,153 @@ class WorkflowRunCleanup:
         related_totals = self._empty_related_counts() if self.dry_run else None
         batch_index = 0
         last_seen: tuple[datetime.datetime, str] | None = None
-        status = "success"
-        run_start = time.monotonic()
-        max_batch_interval_ms = dify_config.SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL
 
-        try:
-            while True:
-                batch_start = time.monotonic()
+        max_batch_interval_ms = int(os.environ.get("SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL", 200))
 
-                fetch_start = time.monotonic()
-                run_rows = self.workflow_run_repo.get_runs_batch_by_time_range(
-                    start_from=self.window_start,
-                    end_before=self.window_end,
-                    last_seen=last_seen,
-                    batch_size=self.batch_size,
+        while True:
+            batch_start = time.monotonic()
+
+            fetch_start = time.monotonic()
+            run_rows = self.workflow_run_repo.get_runs_batch_by_time_range(
+                start_from=self.window_start,
+                end_before=self.window_end,
+                last_seen=last_seen,
+                batch_size=self.batch_size,
+            )
+            if not run_rows:
+                logger.info("workflow_run_cleanup (batch #%s): no more rows to process", batch_index + 1)
+                break
+
+            batch_index += 1
+            last_seen = (run_rows[-1].created_at, run_rows[-1].id)
+            logger.info(
+                "workflow_run_cleanup (batch #%s): fetched %s rows in %sms",
+                batch_index,
+                len(run_rows),
+                int((time.monotonic() - fetch_start) * 1000),
+            )
+
+            tenant_ids = {row.tenant_id for row in run_rows}
+
+            filter_start = time.monotonic()
+            free_tenants = self._filter_free_tenants(tenant_ids)
+            logger.info(
+                "workflow_run_cleanup (batch #%s): filtered %s free tenants from %s tenants in %sms",
+                batch_index,
+                len(free_tenants),
+                len(tenant_ids),
+                int((time.monotonic() - filter_start) * 1000),
+            )
+
+            free_runs = [row for row in run_rows if row.tenant_id in free_tenants]
+            paid_or_skipped = len(run_rows) - len(free_runs)
+
+            if not free_runs:
+                skipped_message = (
+                    f"[batch #{batch_index}] skipped (no sandbox runs in batch, {paid_or_skipped} paid/unknown)"
                 )
-                if not run_rows:
-                    logger.info("workflow_run_cleanup (batch #%s): no more rows to process", batch_index + 1)
-                    break
-
-                batch_index += 1
-                last_seen = (run_rows[-1].created_at, run_rows[-1].id)
-                logger.info(
-                    "workflow_run_cleanup (batch #%s): fetched %s rows in %sms",
-                    batch_index,
-                    len(run_rows),
-                    int((time.monotonic() - fetch_start) * 1000),
-                )
-
-                tenant_ids = {row.tenant_id for row in run_rows}
-
-                filter_start = time.monotonic()
-                free_tenants = self._filter_free_tenants(tenant_ids)
-                logger.info(
-                    "workflow_run_cleanup (batch #%s): filtered %s free tenants from %s tenants in %sms",
-                    batch_index,
-                    len(free_tenants),
-                    len(tenant_ids),
-                    int((time.monotonic() - filter_start) * 1000),
-                )
-
-                free_runs = [row for row in run_rows if row.tenant_id in free_tenants]
-                paid_or_skipped = len(run_rows) - len(free_runs)
-
-                if not free_runs:
-                    skipped_message = (
-                        f"[batch #{batch_index}] skipped (no sandbox runs in batch, {paid_or_skipped} paid/unknown)"
-                    )
-                    click.echo(
-                        click.style(
-                            skipped_message,
-                            fg="yellow",
-                        )
-                    )
-                    self._metrics.record_batch(
-                        batch_rows=len(run_rows),
-                        targeted_runs=0,
-                        skipped_runs=paid_or_skipped,
-                        deleted_runs=0,
-                        related_counts=None,
-                        related_action=None,
-                        batch_duration_seconds=time.monotonic() - batch_start,
-                    )
-                    continue
-
-                total_runs_targeted += len(free_runs)
-
-                if self.dry_run:
-                    count_start = time.monotonic()
-                    batch_counts = self.workflow_run_repo.count_runs_with_related(
-                        free_runs,
-                        count_node_executions=self._count_node_executions,
-                        count_trigger_logs=self._count_trigger_logs,
-                    )
-                    logger.info(
-                        "workflow_run_cleanup (batch #%s, dry_run): counted related records in %sms",
-                        batch_index,
-                        int((time.monotonic() - count_start) * 1000),
-                    )
-                    if related_totals is not None:
-                        for key in related_totals:
-                            related_totals[key] += batch_counts.get(key, 0)
-                    sample_ids = ", ".join(run.id for run in free_runs[:5])
-                    click.echo(
-                        click.style(
-                            f"[batch #{batch_index}] would delete {len(free_runs)} runs "
-                            f"(sample ids: {sample_ids}) and skip {paid_or_skipped} paid/unknown",
-                            fg="yellow",
-                        )
-                    )
-                    logger.info(
-                        "workflow_run_cleanup (batch #%s, dry_run): batch total %sms",
-                        batch_index,
-                        int((time.monotonic() - batch_start) * 1000),
-                    )
-                    self._metrics.record_batch(
-                        batch_rows=len(run_rows),
-                        targeted_runs=len(free_runs),
-                        skipped_runs=paid_or_skipped,
-                        deleted_runs=0,
-                        related_counts={key: batch_counts.get(key, 0) for key in self._empty_related_counts()},
-                        related_action="would_delete",
-                        batch_duration_seconds=time.monotonic() - batch_start,
-                    )
-                    continue
-
-                try:
-                    delete_start = time.monotonic()
-                    counts = self.workflow_run_repo.delete_runs_with_related(
-                        free_runs,
-                        delete_node_executions=self._delete_node_executions,
-                        delete_trigger_logs=self._delete_trigger_logs,
-                    )
-                    delete_ms = int((time.monotonic() - delete_start) * 1000)
-                except Exception:
-                    logger.exception("Failed to delete workflow runs batch ending at %s", last_seen[0])
-                    raise
-
-                total_runs_deleted += counts["runs"]
                 click.echo(
                     click.style(
-                        f"[batch #{batch_index}] deleted runs: {counts['runs']} "
-                        f"(nodes {counts['node_executions']}, offloads {counts['offloads']}, "
-                        f"app_logs {counts['app_logs']}, trigger_logs {counts['trigger_logs']}, "
-                        f"pauses {counts['pauses']}, pause_reasons {counts['pause_reasons']}); "
-                        f"skipped {paid_or_skipped} paid/unknown",
-                        fg="green",
+                        skipped_message,
+                        fg="yellow",
+                    )
+                )
+                continue
+
+            total_runs_targeted += len(free_runs)
+
+            if self.dry_run:
+                count_start = time.monotonic()
+                batch_counts = self.workflow_run_repo.count_runs_with_related(
+                    free_runs,
+                    count_node_executions=self._count_node_executions,
+                    count_trigger_logs=self._count_trigger_logs,
+                )
+                logger.info(
+                    "workflow_run_cleanup (batch #%s, dry_run): counted related records in %sms",
+                    batch_index,
+                    int((time.monotonic() - count_start) * 1000),
+                )
+                if related_totals is not None:
+                    for key in related_totals:
+                        related_totals[key] += batch_counts.get(key, 0)
+                sample_ids = ", ".join(run.id for run in free_runs[:5])
+                click.echo(
+                    click.style(
+                        f"[batch #{batch_index}] would delete {len(free_runs)} runs "
+                        f"(sample ids: {sample_ids}) and skip {paid_or_skipped} paid/unknown",
+                        fg="yellow",
                     )
                 )
                 logger.info(
-                    "workflow_run_cleanup (batch #%s): delete %sms, batch total %sms",
+                    "workflow_run_cleanup (batch #%s, dry_run): batch total %sms",
                     batch_index,
-                    delete_ms,
                     int((time.monotonic() - batch_start) * 1000),
                 )
-                self._metrics.record_batch(
-                    batch_rows=len(run_rows),
-                    targeted_runs=len(free_runs),
-                    skipped_runs=paid_or_skipped,
-                    deleted_runs=counts["runs"],
-                    related_counts={key: counts.get(key, 0) for key in self._empty_related_counts()},
-                    related_action="deleted",
-                    batch_duration_seconds=time.monotonic() - batch_start,
+                continue
+
+            try:
+                delete_start = time.monotonic()
+                counts = self.workflow_run_repo.delete_runs_with_related(
+                    free_runs,
+                    delete_node_executions=self._delete_node_executions,
+                    delete_trigger_logs=self._delete_trigger_logs,
                 )
+                delete_ms = int((time.monotonic() - delete_start) * 1000)
+            except Exception:
+                logger.exception("Failed to delete workflow runs batch ending at %s", last_seen[0])
+                raise
 
-                # Random sleep between batches to avoid overwhelming the database
-                sleep_ms = random.uniform(0, max_batch_interval_ms)  # noqa: S311
-                logger.info("workflow_run_cleanup (batch #%s): sleeping for %.2fms", batch_index, sleep_ms)
-                time.sleep(sleep_ms / 1000)
-
-            if self.dry_run:
-                if self.window_start:
-                    summary_message = (
-                        f"Dry run complete. Would delete {total_runs_targeted} workflow runs "
-                        f"between {self.window_start.isoformat()} and {self.window_end.isoformat()}"
-                    )
-                else:
-                    summary_message = (
-                        f"Dry run complete. Would delete {total_runs_targeted} workflow runs "
-                        f"before {self.window_end.isoformat()}"
-                    )
-                if related_totals is not None:
-                    summary_message = (
-                        f"{summary_message}; related records: {self._format_related_counts(related_totals)}"
-                    )
-                summary_color = "yellow"
-            else:
-                if self.window_start:
-                    summary_message = (
-                        f"Cleanup complete. Deleted {total_runs_deleted} workflow runs "
-                        f"between {self.window_start.isoformat()} and {self.window_end.isoformat()}"
-                    )
-                else:
-                    summary_message = (
-                        f"Cleanup complete. Deleted {total_runs_deleted} workflow runs "
-                        f"before {self.window_end.isoformat()}"
-                    )
-                summary_color = "white"
-
-            click.echo(click.style(summary_message, fg=summary_color))
-        except Exception:
-            status = "failed"
-            raise
-        finally:
-            self._metrics.record_completion(
-                status=status,
-                job_duration_seconds=time.monotonic() - run_start,
+            total_runs_deleted += counts["runs"]
+            click.echo(
+                click.style(
+                    f"[batch #{batch_index}] deleted runs: {counts['runs']} "
+                    f"(nodes {counts['node_executions']}, offloads {counts['offloads']}, "
+                    f"app_logs {counts['app_logs']}, trigger_logs {counts['trigger_logs']}, "
+                    f"pauses {counts['pauses']}, pause_reasons {counts['pause_reasons']}); "
+                    f"skipped {paid_or_skipped} paid/unknown",
+                    fg="green",
+                )
             )
+            logger.info(
+                "workflow_run_cleanup (batch #%s): delete %sms, batch total %sms",
+                batch_index,
+                delete_ms,
+                int((time.monotonic() - batch_start) * 1000),
+            )
+
+            # Random sleep between batches to avoid overwhelming the database
+            sleep_ms = random.uniform(0, max_batch_interval_ms)  # noqa: S311
+            logger.info("workflow_run_cleanup (batch #%s): sleeping for %.2fms", batch_index, sleep_ms)
+            time.sleep(sleep_ms / 1000)
+
+        if self.dry_run:
+            if self.window_start:
+                summary_message = (
+                    f"Dry run complete. Would delete {total_runs_targeted} workflow runs "
+                    f"between {self.window_start.isoformat()} and {self.window_end.isoformat()}"
+                )
+            else:
+                summary_message = (
+                    f"Dry run complete. Would delete {total_runs_targeted} workflow runs "
+                    f"before {self.window_end.isoformat()}"
+                )
+            if related_totals is not None:
+                summary_message = f"{summary_message}; related records: {self._format_related_counts(related_totals)}"
+            summary_color = "yellow"
+        else:
+            if self.window_start:
+                summary_message = (
+                    f"Cleanup complete. Deleted {total_runs_deleted} workflow runs "
+                    f"between {self.window_start.isoformat()} and {self.window_end.isoformat()}"
+                )
+            else:
+                summary_message = (
+                    f"Cleanup complete. Deleted {total_runs_deleted} workflow runs before {self.window_end.isoformat()}"
+                )
+            summary_color = "white"
+
+        click.echo(click.style(summary_message, fg=summary_color))
 
     def _filter_free_tenants(self, tenant_ids: Iterable[str]) -> set[str]:
         tenant_id_list = list(tenant_ids)

api/services/vector_service.py

@@ -156,8 +156,7 @@ class VectorService:
         )
         # use full doc mode to generate segment's child chunk
         processing_rule_dict = processing_rule.to_dict()
-        if processing_rule_dict["rules"] is not None:
-            processing_rule_dict["rules"]["parent_mode"] = ParentMode.FULL_DOC
+        processing_rule_dict["rules"]["parent_mode"] = ParentMode.FULL_DOC
         documents = index_processor.transform(
             [document],
             embedding_model_instance=embedding_model_instance,

api/services/workflow_draft_variable_service.py

@@ -77,7 +77,6 @@ class DraftVarLoader(VariableLoader):
     _engine: Engine
     # Application ID for which variables are being loaded.
     _app_id: str
-    _user_id: str
     _tenant_id: str
     _fallback_variables: Sequence[VariableBase]
 
@@ -86,12 +85,10 @@ class DraftVarLoader(VariableLoader):
         engine: Engine,
         app_id: str,
         tenant_id: str,
-        user_id: str,
         fallback_variables: Sequence[VariableBase] | None = None,
     ):
         self._engine = engine
         self._app_id = app_id
-        self._user_id = user_id
         self._tenant_id = tenant_id
         self._fallback_variables = fallback_variables or []
 
@@ -107,7 +104,7 @@ class DraftVarLoader(VariableLoader):
 
         with Session(bind=self._engine, expire_on_commit=False) as session:
             srv = WorkflowDraftVariableService(session)
-            draft_vars = srv.get_draft_variables_by_selectors(self._app_id, selectors, user_id=self._user_id)
+            draft_vars = srv.get_draft_variables_by_selectors(self._app_id, selectors)
 
         # Important:
         files: list[File] = []
@@ -221,7 +218,6 @@ class WorkflowDraftVariableService:
         self,
         app_id: str,
         selectors: Sequence[list[str]],
-        user_id: str,
     ) -> list[WorkflowDraftVariable]:
         """
         Retrieve WorkflowDraftVariable instances based on app_id and selectors.
@@ -242,30 +238,22 @@ class WorkflowDraftVariableService:
         # Alternatively, a `SELECT` statement could be constructed for each selector and
         # combined using `UNION` to fetch all rows.
         # Benchmarking indicates that both approaches yield comparable performance.
-        query = (
+        variables = (
             self._session.query(WorkflowDraftVariable)
             .options(
                 orm.selectinload(WorkflowDraftVariable.variable_file).selectinload(
                     WorkflowDraftVariableFile.upload_file
                 )
             )
-            .where(
-                WorkflowDraftVariable.app_id == app_id,
-                WorkflowDraftVariable.user_id == user_id,
-                or_(*ors),
-            )
+            .where(WorkflowDraftVariable.app_id == app_id, or_(*ors))
+            .all()
         )
-        return query.all()
+        return variables
 
-    def list_variables_without_values(
-        self, app_id: str, page: int, limit: int, user_id: str
-    ) -> WorkflowDraftVariableList:
-        criteria = [
-            WorkflowDraftVariable.app_id == app_id,
-            WorkflowDraftVariable.user_id == user_id,
-        ]
+    def list_variables_without_values(self, app_id: str, page: int, limit: int) -> WorkflowDraftVariableList:
+        criteria = WorkflowDraftVariable.app_id == app_id
         total = None
-        query = self._session.query(WorkflowDraftVariable).where(*criteria)
+        query = self._session.query(WorkflowDraftVariable).where(criteria)
         if page == 1:
             total = query.count()
         variables = (
@@ -281,12 +269,11 @@ class WorkflowDraftVariableService:
 
         return WorkflowDraftVariableList(variables=variables, total=total)
 
-    def _list_node_variables(self, app_id: str, node_id: str, user_id: str) -> WorkflowDraftVariableList:
-        criteria = [
+    def _list_node_variables(self, app_id: str, node_id: str) -> WorkflowDraftVariableList:
+        criteria = (
             WorkflowDraftVariable.app_id == app_id,
             WorkflowDraftVariable.node_id == node_id,
-            WorkflowDraftVariable.user_id == user_id,
-        ]
+        )
         query = self._session.query(WorkflowDraftVariable).where(*criteria)
         variables = (
             query.options(orm.selectinload(WorkflowDraftVariable.variable_file))
@@ -295,36 +282,36 @@ class WorkflowDraftVariableService:
         )
         return WorkflowDraftVariableList(variables=variables)
 
-    def list_node_variables(self, app_id: str, node_id: str, user_id: str) -> WorkflowDraftVariableList:
-        return self._list_node_variables(app_id, node_id, user_id=user_id)
+    def list_node_variables(self, app_id: str, node_id: str) -> WorkflowDraftVariableList:
+        return self._list_node_variables(app_id, node_id)
 
-    def list_conversation_variables(self, app_id: str, user_id: str) -> WorkflowDraftVariableList:
-        return self._list_node_variables(app_id, CONVERSATION_VARIABLE_NODE_ID, user_id=user_id)
+    def list_conversation_variables(self, app_id: str) -> WorkflowDraftVariableList:
+        return self._list_node_variables(app_id, CONVERSATION_VARIABLE_NODE_ID)
 
-    def list_system_variables(self, app_id: str, user_id: str) -> WorkflowDraftVariableList:
-        return self._list_node_variables(app_id, SYSTEM_VARIABLE_NODE_ID, user_id=user_id)
+    def list_system_variables(self, app_id: str) -> WorkflowDraftVariableList:
+        return self._list_node_variables(app_id, SYSTEM_VARIABLE_NODE_ID)
 
-    def get_conversation_variable(self, app_id: str, name: str, user_id: str) -> WorkflowDraftVariable | None:
-        return self._get_variable(app_id=app_id, node_id=CONVERSATION_VARIABLE_NODE_ID, name=name, user_id=user_id)
+    def get_conversation_variable(self, app_id: str, name: str) -> WorkflowDraftVariable | None:
+        return self._get_variable(app_id=app_id, node_id=CONVERSATION_VARIABLE_NODE_ID, name=name)
 
-    def get_system_variable(self, app_id: str, name: str, user_id: str) -> WorkflowDraftVariable | None:
-        return self._get_variable(app_id=app_id, node_id=SYSTEM_VARIABLE_NODE_ID, name=name, user_id=user_id)
+    def get_system_variable(self, app_id: str, name: str) -> WorkflowDraftVariable | None:
+        return self._get_variable(app_id=app_id, node_id=SYSTEM_VARIABLE_NODE_ID, name=name)
 
-    def get_node_variable(self, app_id: str, node_id: str, name: str, user_id: str) -> WorkflowDraftVariable | None:
-        return self._get_variable(app_id, node_id, name, user_id=user_id)
+    def get_node_variable(self, app_id: str, node_id: str, name: str) -> WorkflowDraftVariable | None:
+        return self._get_variable(app_id, node_id, name)
 
-    def _get_variable(self, app_id: str, node_id: str, name: str, user_id: str) -> WorkflowDraftVariable | None:
-        return (
+    def _get_variable(self, app_id: str, node_id: str, name: str) -> WorkflowDraftVariable | None:
+        variable = (
             self._session.query(WorkflowDraftVariable)
             .options(orm.selectinload(WorkflowDraftVariable.variable_file))
             .where(
                 WorkflowDraftVariable.app_id == app_id,
                 WorkflowDraftVariable.node_id == node_id,
                 WorkflowDraftVariable.name == name,
-                WorkflowDraftVariable.user_id == user_id,
             )
             .first()
         )
+        return variable
 
     def update_variable(
         self,
@@ -475,17 +462,7 @@ class WorkflowDraftVariableService:
         self._session.delete(upload_file)
         self._session.delete(variable)
 
-    def delete_user_workflow_variables(self, app_id: str, user_id: str):
-        (
-            self._session.query(WorkflowDraftVariable)
-            .where(
-                WorkflowDraftVariable.app_id == app_id,
-                WorkflowDraftVariable.user_id == user_id,
-            )
-            .delete(synchronize_session=False)
-        )
-
-    def delete_app_workflow_variables(self, app_id: str):
+    def delete_workflow_variables(self, app_id: str):
         (
             self._session.query(WorkflowDraftVariable)
             .where(WorkflowDraftVariable.app_id == app_id)
@@ -524,35 +501,28 @@ class WorkflowDraftVariableService:
                 self._session.delete(upload_file)
                 self._session.delete(variable_file)
 
-    def delete_node_variables(self, app_id: str, node_id: str, user_id: str):
-        return self._delete_node_variables(app_id, node_id, user_id=user_id)
+    def delete_node_variables(self, app_id: str, node_id: str):
+        return self._delete_node_variables(app_id, node_id)
 
-    def _delete_node_variables(self, app_id: str, node_id: str, user_id: str):
-        (
-            self._session.query(WorkflowDraftVariable)
-            .where(
-                WorkflowDraftVariable.app_id == app_id,
-                WorkflowDraftVariable.node_id == node_id,
-                WorkflowDraftVariable.user_id == user_id,
-            )
-            .delete(synchronize_session=False)
-        )
+    def _delete_node_variables(self, app_id: str, node_id: str):
+        self._session.query(WorkflowDraftVariable).where(
+            WorkflowDraftVariable.app_id == app_id,
+            WorkflowDraftVariable.node_id == node_id,
+        ).delete()
 
-    def _get_conversation_id_from_draft_variable(self, app_id: str, user_id: str) -> str | None:
+    def _get_conversation_id_from_draft_variable(self, app_id: str) -> str | None:
         draft_var = self._get_variable(
             app_id=app_id,
             node_id=SYSTEM_VARIABLE_NODE_ID,
             name=str(SystemVariableKey.CONVERSATION_ID),
-            user_id=user_id,
         )
         if draft_var is None:
             return None
         segment = draft_var.get_value()
         if not isinstance(segment, StringSegment):
             logger.warning(
-                "sys.conversation_id variable is not a string: app_id=%s, user_id=%s, id=%s",
+                "sys.conversation_id variable is not a string: app_id=%s, id=%s",
                 app_id,
-                user_id,
                 draft_var.id,
             )
             return None
@@ -573,7 +543,7 @@ class WorkflowDraftVariableService:
 
         If no such conversation exists, a new conversation is created and its ID is returned.
         """
-        conv_id = self._get_conversation_id_from_draft_variable(workflow.app_id, account_id)
+        conv_id = self._get_conversation_id_from_draft_variable(workflow.app_id)
 
         if conv_id is not None:
             conversation = (
@@ -610,13 +580,12 @@ class WorkflowDraftVariableService:
         self._session.flush()
         return conversation.id
 
-    def prefill_conversation_variable_default_values(self, workflow: Workflow, user_id: str):
+    def prefill_conversation_variable_default_values(self, workflow: Workflow):
         """"""
         draft_conv_vars: list[WorkflowDraftVariable] = []
         for conv_var in workflow.conversation_variables:
             draft_var = WorkflowDraftVariable.new_conversation_variable(
                 app_id=workflow.app_id,
-                user_id=user_id,
                 name=conv_var.name,
                 value=conv_var,
                 description=conv_var.description,
@@ -666,7 +635,7 @@ def _batch_upsert_draft_variable(
         stmt = pg_insert(WorkflowDraftVariable).values([_model_to_insertion_dict(v) for v in draft_vars])
         if policy == _UpsertPolicy.OVERWRITE:
             stmt = stmt.on_conflict_do_update(
-                index_elements=WorkflowDraftVariable.unique_app_id_user_id_node_id_name(),
+                index_elements=WorkflowDraftVariable.unique_app_id_node_id_name(),
                 set_={
                     # Refresh creation timestamp to ensure updated variables
                     # appear first in chronologically sorted result sets.
@@ -683,9 +652,7 @@ def _batch_upsert_draft_variable(
                 },
             )
         elif policy == _UpsertPolicy.IGNORE:
-            stmt = stmt.on_conflict_do_nothing(
-                index_elements=WorkflowDraftVariable.unique_app_id_user_id_node_id_name()
-            )
+            stmt = stmt.on_conflict_do_nothing(index_elements=WorkflowDraftVariable.unique_app_id_node_id_name())
     else:
         stmt = mysql_insert(WorkflowDraftVariable).values([_model_to_insertion_dict(v) for v in draft_vars])  # type: ignore[assignment]
         if policy == _UpsertPolicy.OVERWRITE:
@@ -715,7 +682,6 @@ def _model_to_insertion_dict(model: WorkflowDraftVariable) -> dict[str, Any]:
     d: dict[str, Any] = {
         "id": model.id,
         "app_id": model.app_id,
-        "user_id": model.user_id,
         "last_edited_at": None,
         "node_id": model.node_id,
         "name": model.name,
@@ -841,7 +807,6 @@ class DraftVariableSaver:
     def _create_dummy_output_variable(self):
         return WorkflowDraftVariable.new_node_variable(
             app_id=self._app_id,
-            user_id=self._user.id,
             node_id=self._node_id,
             name=self._DUMMY_OUTPUT_IDENTITY,
             node_execution_id=self._node_execution_id,
@@ -877,7 +842,6 @@ class DraftVariableSaver:
             draft_vars.append(
                 WorkflowDraftVariable.new_conversation_variable(
                     app_id=self._app_id,
-                    user_id=self._user.id,
                     name=item.name,
                     value=segment,
                 )
@@ -898,7 +862,6 @@ class DraftVariableSaver:
                 draft_vars.append(
                     WorkflowDraftVariable.new_node_variable(
                         app_id=self._app_id,
-                        user_id=self._user.id,
                         node_id=self._node_id,
                         name=name,
                         node_execution_id=self._node_execution_id,
@@ -921,7 +884,6 @@ class DraftVariableSaver:
                 draft_vars.append(
                     WorkflowDraftVariable.new_sys_variable(
                         app_id=self._app_id,
-                        user_id=self._user.id,
                         name=name,
                         node_execution_id=self._node_execution_id,
                         value=value_seg,
@@ -1057,7 +1019,6 @@ class DraftVariableSaver:
             # Create the draft variable
             draft_var = WorkflowDraftVariable.new_node_variable(
                 app_id=self._app_id,
-                user_id=self._user.id,
                 node_id=self._node_id,
                 name=name,
                 node_execution_id=self._node_execution_id,
@@ -1071,7 +1032,6 @@ class DraftVariableSaver:
             # Create the draft variable
             draft_var = WorkflowDraftVariable.new_node_variable(
                 app_id=self._app_id,
-                user_id=self._user.id,
                 node_id=self._node_id,
                 name=name,
                 node_execution_id=self._node_execution_id,

api/services/workflow_service.py

@@ -697,7 +697,7 @@ class WorkflowService:
 
         with Session(bind=db.engine, expire_on_commit=False) as session, session.begin():
             draft_var_srv = WorkflowDraftVariableService(session)
-            draft_var_srv.prefill_conversation_variable_default_values(draft_workflow, user_id=account.id)
+            draft_var_srv.prefill_conversation_variable_default_values(draft_workflow)
 
         node_config = draft_workflow.get_node_config_by_id(node_id)
         node_type = Workflow.get_node_type_from_node_config(node_config)
@@ -740,7 +740,6 @@ class WorkflowService:
             engine=db.engine,
             app_id=app_model.id,
             tenant_id=app_model.tenant_id,
-            user_id=account.id,
         )
 
         enclosing_node_type_and_id = draft_workflow.get_enclosing_node_type_and_id(node_config)
@@ -832,7 +831,6 @@ class WorkflowService:
             workflow=draft_workflow,
             node_config=node_config,
             manual_inputs=inputs or {},
-            user_id=account.id,
         )
         node = self._build_human_input_node(
             workflow=draft_workflow,
@@ -893,7 +891,6 @@ class WorkflowService:
             workflow=draft_workflow,
             node_config=node_config,
             manual_inputs=inputs or {},
-            user_id=account.id,
         )
         node = self._build_human_input_node(
             workflow=draft_workflow,
@@ -970,7 +967,6 @@ class WorkflowService:
             workflow=draft_workflow,
             node_config=node_config,
             manual_inputs=inputs or {},
-            user_id=account.id,
         )
         node = self._build_human_input_node(
             workflow=draft_workflow,
@@ -1106,11 +1102,10 @@ class WorkflowService:
         workflow: Workflow,
         node_config: NodeConfigDict,
         manual_inputs: Mapping[str, Any],
-        user_id: str,
     ) -> VariablePool:
         with Session(bind=db.engine, expire_on_commit=False) as session, session.begin():
             draft_var_srv = WorkflowDraftVariableService(session)
-            draft_var_srv.prefill_conversation_variable_default_values(workflow, user_id=user_id)
+            draft_var_srv.prefill_conversation_variable_default_values(workflow)
 
         variable_pool = VariablePool(
             system_variables=SystemVariable.default(),
@@ -1123,7 +1118,6 @@ class WorkflowService:
             engine=db.engine,
             app_id=app_model.id,
             tenant_id=app_model.tenant_id,
-            user_id=user_id,
         )
         variable_mapping = HumanInputNode.extract_variable_selector_to_variable_mapping(
             graph_config=workflow.graph_dict,

api/tasks/mail_human_input_delivery_task.py

@@ -111,7 +111,7 @@ def _render_body(
         url=form_link,
         variable_pool=variable_pool,
     )
-    return EmailDeliveryConfig.render_markdown_body(body)
+    return body
 
 
 def _load_variable_pool(workflow_run_id: str | None) -> VariablePool | None:
@@ -173,11 +173,10 @@ def dispatch_human_input_email_task(form_id: str, node_title: str | None = None,
             for recipient in job.recipients:
                 form_link = _build_form_link(recipient.token)
                 body = _render_body(job.body, form_link, variable_pool=variable_pool)
-                subject = EmailDeliveryConfig.sanitize_subject(job.subject)
 
                 mail.send(
                     to=recipient.email,
-                    subject=subject,
+                    subject=job.subject,
                     html=body,
                 )
 

api/tests/integration_tests/services/test_workflow_draft_variable_service.py

@@ -30,7 +30,6 @@ from services.workflow_draft_variable_service import (
 class TestWorkflowDraftVariableService(unittest.TestCase):
     _test_app_id: str
     _session: Session
-    _test_user_id: str
     _node1_id = "test_node_1"
     _node2_id = "test_node_2"
     _node_exec_id = str(uuid.uuid4())
@@ -100,13 +99,13 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test_list_variables(self):
         srv = self._get_test_srv()
-        var_list = srv.list_variables_without_values(self._test_app_id, page=1, limit=2, user_id=self._test_user_id)
+        var_list = srv.list_variables_without_values(self._test_app_id, page=1, limit=2)
         assert var_list.total == 5
         assert len(var_list.variables) == 2
         page1_var_ids = {v.id for v in var_list.variables}
         assert page1_var_ids.issubset(self._variable_ids)
 
-        var_list_2 = srv.list_variables_without_values(self._test_app_id, page=2, limit=2, user_id=self._test_user_id)
+        var_list_2 = srv.list_variables_without_values(self._test_app_id, page=2, limit=2)
         assert var_list_2.total is None
         assert len(var_list_2.variables) == 2
         page2_var_ids = {v.id for v in var_list_2.variables}
@@ -115,7 +114,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test_get_node_variable(self):
         srv = self._get_test_srv()
-        node_var = srv.get_node_variable(self._test_app_id, self._node1_id, "str_var", user_id=self._test_user_id)
+        node_var = srv.get_node_variable(self._test_app_id, self._node1_id, "str_var")
         assert node_var is not None
         assert node_var.id == self._node1_str_var_id
         assert node_var.name == "str_var"
@@ -123,7 +122,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test_get_system_variable(self):
         srv = self._get_test_srv()
-        sys_var = srv.get_system_variable(self._test_app_id, "sys_var", user_id=self._test_user_id)
+        sys_var = srv.get_system_variable(self._test_app_id, "sys_var")
         assert sys_var is not None
         assert sys_var.id == self._sys_var_id
         assert sys_var.name == "sys_var"
@@ -131,7 +130,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test_get_conversation_variable(self):
         srv = self._get_test_srv()
-        conv_var = srv.get_conversation_variable(self._test_app_id, "conv_var", user_id=self._test_user_id)
+        conv_var = srv.get_conversation_variable(self._test_app_id, "conv_var")
         assert conv_var is not None
         assert conv_var.id == self._conv_var_id
         assert conv_var.name == "conv_var"
@@ -139,7 +138,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test_delete_node_variables(self):
         srv = self._get_test_srv()
-        srv.delete_node_variables(self._test_app_id, self._node2_id, user_id=self._test_user_id)
+        srv.delete_node_variables(self._test_app_id, self._node2_id)
         node2_var_count = (
             self._session.query(WorkflowDraftVariable)
             .where(
@@ -163,7 +162,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
 
     def test__list_node_variables(self):
         srv = self._get_test_srv()
-        node_vars = srv._list_node_variables(self._test_app_id, self._node2_id, user_id=self._test_user_id)
+        node_vars = srv._list_node_variables(self._test_app_id, self._node2_id)
         assert len(node_vars.variables) == 2
         assert {v.id for v in node_vars.variables} == set(self._node2_var_ids)
 
@@ -174,7 +173,7 @@ class TestWorkflowDraftVariableService(unittest.TestCase):
             [self._node2_id, "str_var"],
             [self._node2_id, "int_var"],
         ]
-        variables = srv.get_draft_variables_by_selectors(self._test_app_id, selectors, user_id=self._test_user_id)
+        variables = srv.get_draft_variables_by_selectors(self._test_app_id, selectors)
         assert len(variables) == 3
         assert {v.id for v in variables} == {self._node1_str_var_id} | set(self._node2_var_ids)
 
@@ -207,23 +206,19 @@ class TestDraftVariableLoader(unittest.TestCase):
     def setUp(self):
         self._test_app_id = str(uuid.uuid4())
         self._test_tenant_id = str(uuid.uuid4())
-        self._test_user_id = str(uuid.uuid4())
         sys_var = WorkflowDraftVariable.new_sys_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             name="sys_var",
             value=build_segment("sys_value"),
             node_execution_id=self._node_exec_id,
         )
         conv_var = WorkflowDraftVariable.new_conversation_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             name="conv_var",
             value=build_segment("conv_value"),
         )
         node_var = WorkflowDraftVariable.new_node_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             node_id=self._node1_id,
             name="str_var",
             value=build_segment("str_value"),
@@ -253,22 +248,12 @@ class TestDraftVariableLoader(unittest.TestCase):
             session.commit()
 
     def test_variable_loader_with_empty_selector(self):
-        var_loader = DraftVarLoader(
-            engine=db.engine,
-            app_id=self._test_app_id,
-            tenant_id=self._test_tenant_id,
-            user_id=self._test_user_id,
-        )
+        var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
         variables = var_loader.load_variables([])
         assert len(variables) == 0
 
     def test_variable_loader_with_non_empty_selector(self):
-        var_loader = DraftVarLoader(
-            engine=db.engine,
-            app_id=self._test_app_id,
-            tenant_id=self._test_tenant_id,
-            user_id=self._test_user_id,
-        )
+        var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
         variables = var_loader.load_variables(
             [
                 [SYSTEM_VARIABLE_NODE_ID, "sys_var"],
@@ -311,12 +296,7 @@ class TestDraftVariableLoader(unittest.TestCase):
                 session.commit()
 
                 # Now test loading using DraftVarLoader
-                var_loader = DraftVarLoader(
-                    engine=db.engine,
-                    app_id=self._test_app_id,
-                    tenant_id=self._test_tenant_id,
-                    user_id=setup_account.id,
-                )
+                var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
 
                 # Load the variable using the standard workflow
                 variables = var_loader.load_variables([["test_offload_node", "offloaded_string_var"]])
@@ -333,7 +313,7 @@ class TestDraftVariableLoader(unittest.TestCase):
             # Clean up - delete all draft variables for this app
             with Session(bind=db.engine) as session:
                 service = WorkflowDraftVariableService(session)
-                service.delete_app_workflow_variables(self._test_app_id)
+                service.delete_workflow_variables(self._test_app_id)
                 session.commit()
 
     def test_load_offloaded_variable_object_type_integration(self):
@@ -384,7 +364,6 @@ class TestDraftVariableLoader(unittest.TestCase):
                 # Now create the offloaded draft variable with the correct file_id
                 offloaded_var = WorkflowDraftVariable.new_node_variable(
                     app_id=self._test_app_id,
-                    user_id=self._test_user_id,
                     node_id="test_offload_node",
                     name="offloaded_object_var",
                     value=build_segment({"truncated": True}),
@@ -400,9 +379,7 @@ class TestDraftVariableLoader(unittest.TestCase):
                 # Use the service method that properly preloads relationships
                 service = WorkflowDraftVariableService(session)
                 draft_vars = service.get_draft_variables_by_selectors(
-                    self._test_app_id,
-                    [["test_offload_node", "offloaded_object_var"]],
-                    user_id=self._test_user_id,
+                    self._test_app_id, [["test_offload_node", "offloaded_object_var"]]
                 )
 
                 assert len(draft_vars) == 1
@@ -410,12 +387,7 @@ class TestDraftVariableLoader(unittest.TestCase):
                 assert loaded_var.is_truncated()
 
                 # Create DraftVarLoader and test loading
-                var_loader = DraftVarLoader(
-                    engine=db.engine,
-                    app_id=self._test_app_id,
-                    tenant_id=self._test_tenant_id,
-                    user_id=self._test_user_id,
-                )
+                var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
 
                 # Test the _load_offloaded_variable method
                 selector_tuple, variable = var_loader._load_offloaded_variable(loaded_var)
@@ -487,7 +459,6 @@ class TestDraftVariableLoader(unittest.TestCase):
                 # Now create the offloaded draft variable with the correct file_id
                 offloaded_var = WorkflowDraftVariable.new_node_variable(
                     app_id=self._test_app_id,
-                    user_id=self._test_user_id,
                     node_id="test_integration_node",
                     name="offloaded_integration_var",
                     value=build_segment("truncated"),
@@ -502,12 +473,7 @@ class TestDraftVariableLoader(unittest.TestCase):
 
                 # Test load_variables with both regular and offloaded variables
                 # This method should handle the relationship preloading internally
-                var_loader = DraftVarLoader(
-                    engine=db.engine,
-                    app_id=self._test_app_id,
-                    tenant_id=self._test_tenant_id,
-                    user_id=self._test_user_id,
-                )
+                var_loader = DraftVarLoader(engine=db.engine, app_id=self._test_app_id, tenant_id=self._test_tenant_id)
 
                 variables = var_loader.load_variables(
                     [
@@ -606,7 +572,6 @@ class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
         # Create test variables
         self._node_var_with_exec = WorkflowDraftVariable.new_node_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             node_id=self._node_id,
             name="test_var",
             value=build_segment("old_value"),
@@ -616,7 +581,6 @@ class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
 
         self._node_var_without_exec = WorkflowDraftVariable.new_node_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             node_id=self._node_id,
             name="no_exec_var",
             value=build_segment("some_value"),
@@ -627,7 +591,6 @@ class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
 
         self._node_var_missing_exec = WorkflowDraftVariable.new_node_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             node_id=self._node_id,
             name="missing_exec_var",
             value=build_segment("some_value"),
@@ -636,7 +599,6 @@ class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
 
         self._conv_var = WorkflowDraftVariable.new_conversation_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             name="conv_var_1",
             value=build_segment("old_conv_value"),
         )
@@ -802,7 +764,6 @@ class TestWorkflowDraftVariableServiceResetVariable(unittest.TestCase):
         # Create a system variable
         sys_var = WorkflowDraftVariable.new_sys_variable(
             app_id=self._test_app_id,
-            user_id=self._test_user_id,
             name="sys_var",
             value=build_segment("sys_value"),
             node_execution_id=self._node_exec_id,

api/tests/test_containers_integration_tests/conftest.py

@@ -186,7 +186,7 @@ class DifyTestContainers:
         # Start Dify Plugin Daemon container for plugin management
         # Dify Plugin Daemon provides plugin lifecycle management and execution
         logger.info("Initializing Dify Plugin Daemon container...")
-        self.dify_plugin_daemon = DockerContainer(image="langgenius/dify-plugin-daemon:0.5.4-local").with_network(
+        self.dify_plugin_daemon = DockerContainer(image="langgenius/dify-plugin-daemon:0.3.0-local").with_network(
             self.network
         )
         self.dify_plugin_daemon.with_exposed_ports(5002)

api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py

@@ -122,7 +122,6 @@ class TestWorkflowDraftVariableService:
         name,
         value,
         variable_type: DraftVariableType = DraftVariableType.CONVERSATION,
-        user_id: str | None = None,
         fake=None,
     ):
         """
@@ -145,15 +144,10 @@ class TestWorkflowDraftVariableService:
             WorkflowDraftVariable: Created test variable instance with proper type configuration
         """
         fake = fake or Faker()
-        if user_id is None:
-            app = db_session_with_containers.query(App).filter_by(id=app_id).first()
-            assert app is not None
-            user_id = app.created_by
         if variable_type == "conversation":
             # Create conversation variable using the appropriate factory method
             variable = WorkflowDraftVariable.new_conversation_variable(
                 app_id=app_id,
-                user_id=user_id,
                 name=name,
                 value=value,
                 description=fake.text(max_nb_chars=20),
@@ -162,7 +156,6 @@ class TestWorkflowDraftVariableService:
             # Create system variable with editable flag and execution context
             variable = WorkflowDraftVariable.new_sys_variable(
                 app_id=app_id,
-                user_id=user_id,
                 name=name,
                 value=value,
                 node_execution_id=fake.uuid4(),
@@ -172,7 +165,6 @@ class TestWorkflowDraftVariableService:
             # Create node variable with visibility and editability settings
             variable = WorkflowDraftVariable.new_node_variable(
                 app_id=app_id,
-                user_id=user_id,
                 node_id=node_id,
                 name=name,
                 value=value,
@@ -197,13 +189,7 @@ class TestWorkflowDraftVariableService:
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
         test_value = StringSegment(value=fake.word())
         variable = self._create_test_variable(
-            db_session_with_containers,
-            app.id,
-            CONVERSATION_VARIABLE_NODE_ID,
-            "test_var",
-            test_value,
-            user_id=app.created_by,
-            fake=fake,
+            db_session_with_containers, app.id, CONVERSATION_VARIABLE_NODE_ID, "test_var", test_value, fake=fake
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
         retrieved_variable = service.get_variable(variable.id)
@@ -264,7 +250,7 @@ class TestWorkflowDraftVariableService:
             ["test_node_1", "var3"],
         ]
         service = WorkflowDraftVariableService(db_session_with_containers)
-        retrieved_variables = service.get_draft_variables_by_selectors(app.id, selectors, user_id=app.created_by)
+        retrieved_variables = service.get_draft_variables_by_selectors(app.id, selectors)
         assert len(retrieved_variables) == 3
         var_names = [var.name for var in retrieved_variables]
         assert "var1" in var_names
@@ -302,7 +288,7 @@ class TestWorkflowDraftVariableService:
                 fake=fake,
             )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        result = service.list_variables_without_values(app.id, page=1, limit=3, user_id=app.created_by)
+        result = service.list_variables_without_values(app.id, page=1, limit=3)
         assert result.total == 5
         assert len(result.variables) == 3
         assert result.variables[0].created_at >= result.variables[1].created_at
@@ -353,7 +339,7 @@ class TestWorkflowDraftVariableService:
             fake=fake,
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        result = service.list_node_variables(app.id, node_id, user_id=app.created_by)
+        result = service.list_node_variables(app.id, node_id)
         assert len(result.variables) == 2
         for var in result.variables:
             assert var.node_id == node_id
@@ -395,7 +381,7 @@ class TestWorkflowDraftVariableService:
             fake=fake,
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        result = service.list_conversation_variables(app.id, user_id=app.created_by)
+        result = service.list_conversation_variables(app.id)
         assert len(result.variables) == 2
         for var in result.variables:
             assert var.node_id == CONVERSATION_VARIABLE_NODE_ID
@@ -573,7 +559,7 @@ class TestWorkflowDraftVariableService:
         assert len(app_variables) == 3
         assert len(other_app_variables) == 1
         service = WorkflowDraftVariableService(db_session_with_containers)
-        service.delete_user_workflow_variables(app.id, user_id=app.created_by)
+        service.delete_workflow_variables(app.id)
         app_variables_after = db_session_with_containers.query(WorkflowDraftVariable).filter_by(app_id=app.id).all()
         other_app_variables_after = (
             db_session_with_containers.query(WorkflowDraftVariable).filter_by(app_id=other_app.id).all()
@@ -581,69 +567,6 @@ class TestWorkflowDraftVariableService:
         assert len(app_variables_after) == 0
         assert len(other_app_variables_after) == 1
 
-    def test_draft_variables_are_isolated_between_users(
-        self, db_session_with_containers: Session, mock_external_service_dependencies
-    ):
-        """
-        Test draft variable isolation for different users in the same app.
-
-        This test verifies that:
-        1. Query APIs return only variables owned by the target user.
-        2. User-scoped deletion only removes variables for that user and keeps
-           other users' variables in the same app untouched.
-        """
-        fake = Faker()
-        app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
-        user_a = app.created_by
-        user_b = fake.uuid4()
-
-        # Use identical variable names on purpose to verify uniqueness scope includes user_id.
-        self._create_test_variable(
-            db_session_with_containers,
-            app.id,
-            CONVERSATION_VARIABLE_NODE_ID,
-            "shared_name",
-            StringSegment(value="value_a"),
-            user_id=user_a,
-            fake=fake,
-        )
-        self._create_test_variable(
-            db_session_with_containers,
-            app.id,
-            CONVERSATION_VARIABLE_NODE_ID,
-            "shared_name",
-            StringSegment(value="value_b"),
-            user_id=user_b,
-            fake=fake,
-        )
-        self._create_test_variable(
-            db_session_with_containers,
-            app.id,
-            CONVERSATION_VARIABLE_NODE_ID,
-            "only_a",
-            StringSegment(value="only_a"),
-            user_id=user_a,
-            fake=fake,
-        )
-
-        service = WorkflowDraftVariableService(db_session_with_containers)
-
-        user_a_vars = service.list_conversation_variables(app.id, user_id=user_a)
-        user_b_vars = service.list_conversation_variables(app.id, user_id=user_b)
-        assert {v.name for v in user_a_vars.variables} == {"shared_name", "only_a"}
-        assert {v.name for v in user_b_vars.variables} == {"shared_name"}
-
-        service.delete_user_workflow_variables(app.id, user_id=user_a)
-
-        user_a_remaining = (
-            db_session_with_containers.query(WorkflowDraftVariable).filter_by(app_id=app.id, user_id=user_a).count()
-        )
-        user_b_remaining = (
-            db_session_with_containers.query(WorkflowDraftVariable).filter_by(app_id=app.id, user_id=user_b).count()
-        )
-        assert user_a_remaining == 0
-        assert user_b_remaining == 1
-
     def test_delete_node_variables_success(
         self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
@@ -704,7 +627,7 @@ class TestWorkflowDraftVariableService:
         assert len(other_node_variables) == 1
         assert len(conv_variables) == 1
         service = WorkflowDraftVariableService(db_session_with_containers)
-        service.delete_node_variables(app.id, node_id, user_id=app.created_by)
+        service.delete_node_variables(app.id, node_id)
         target_node_variables_after = (
             db_session_with_containers.query(WorkflowDraftVariable).filter_by(app_id=app.id, node_id=node_id).all()
         )
@@ -752,7 +675,7 @@ class TestWorkflowDraftVariableService:
 
         db_session_with_containers.commit()
         service = WorkflowDraftVariableService(db_session_with_containers)
-        service.prefill_conversation_variable_default_values(workflow, user_id="00000000-0000-0000-0000-000000000001")
+        service.prefill_conversation_variable_default_values(workflow)
         draft_variables = (
             db_session_with_containers.query(WorkflowDraftVariable)
             .filter_by(app_id=app.id, node_id=CONVERSATION_VARIABLE_NODE_ID)
@@ -792,7 +715,7 @@ class TestWorkflowDraftVariableService:
             fake=fake,
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        retrieved_conv_id = service._get_conversation_id_from_draft_variable(app.id, app.created_by)
+        retrieved_conv_id = service._get_conversation_id_from_draft_variable(app.id)
         assert retrieved_conv_id == conversation_id
 
     def test_get_conversation_id_from_draft_variable_not_found(
@@ -808,7 +731,7 @@ class TestWorkflowDraftVariableService:
         fake = Faker()
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
         service = WorkflowDraftVariableService(db_session_with_containers)
-        retrieved_conv_id = service._get_conversation_id_from_draft_variable(app.id, app.created_by)
+        retrieved_conv_id = service._get_conversation_id_from_draft_variable(app.id)
         assert retrieved_conv_id is None
 
     def test_list_system_variables_success(
@@ -849,7 +772,7 @@ class TestWorkflowDraftVariableService:
             db_session_with_containers, app.id, CONVERSATION_VARIABLE_NODE_ID, "conv_var", conv_var_value, fake=fake
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        result = service.list_system_variables(app.id, user_id=app.created_by)
+        result = service.list_system_variables(app.id)
         assert len(result.variables) == 2
         for var in result.variables:
             assert var.node_id == SYSTEM_VARIABLE_NODE_ID
@@ -896,15 +819,15 @@ class TestWorkflowDraftVariableService:
             fake=fake,
         )
         service = WorkflowDraftVariableService(db_session_with_containers)
-        retrieved_conv_var = service.get_conversation_variable(app.id, "test_conv_var", user_id=app.created_by)
+        retrieved_conv_var = service.get_conversation_variable(app.id, "test_conv_var")
         assert retrieved_conv_var is not None
         assert retrieved_conv_var.name == "test_conv_var"
         assert retrieved_conv_var.node_id == CONVERSATION_VARIABLE_NODE_ID
-        retrieved_sys_var = service.get_system_variable(app.id, "test_sys_var", user_id=app.created_by)
+        retrieved_sys_var = service.get_system_variable(app.id, "test_sys_var")
         assert retrieved_sys_var is not None
         assert retrieved_sys_var.name == "test_sys_var"
         assert retrieved_sys_var.node_id == SYSTEM_VARIABLE_NODE_ID
-        retrieved_node_var = service.get_node_variable(app.id, "test_node", "test_node_var", user_id=app.created_by)
+        retrieved_node_var = service.get_node_variable(app.id, "test_node", "test_node_var")
         assert retrieved_node_var is not None
         assert retrieved_node_var.name == "test_node_var"
         assert retrieved_node_var.node_id == "test_node"
@@ -922,14 +845,9 @@ class TestWorkflowDraftVariableService:
         fake = Faker()
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, fake=fake)
         service = WorkflowDraftVariableService(db_session_with_containers)
-        retrieved_conv_var = service.get_conversation_variable(app.id, "non_existent_conv_var", user_id=app.created_by)
+        retrieved_conv_var = service.get_conversation_variable(app.id, "non_existent_conv_var")
         assert retrieved_conv_var is None
-        retrieved_sys_var = service.get_system_variable(app.id, "non_existent_sys_var", user_id=app.created_by)
+        retrieved_sys_var = service.get_system_variable(app.id, "non_existent_sys_var")
         assert retrieved_sys_var is None
-        retrieved_node_var = service.get_node_variable(
-            app.id,
-            "test_node",
-            "non_existent_node_var",
-            user_id=app.created_by,
-        )
+        retrieved_node_var = service.get_node_variable(app.id, "test_node", "non_existent_node_var")
         assert retrieved_node_var is None

api/tests/unit_tests/commands/test_clean_expired_messages.py

@@ -46,7 +46,6 @@ def test_absolute_mode_calls_from_time_range():
         end_before=end_before,
         batch_size=200,
         dry_run=True,
-        task_label="custom",
     )
     mock_from_days.assert_not_called()
 
@@ -75,7 +74,6 @@ def test_relative_mode_before_days_only_calls_from_days():
         days=30,
         batch_size=500,
         dry_run=False,
-        task_label="before-30",
     )
     mock_from_time_range.assert_not_called()
 
@@ -107,7 +105,6 @@ def test_relative_mode_with_from_days_ago_calls_from_time_range():
         end_before=fixed_now - datetime.timedelta(days=30),
         batch_size=1000,
         dry_run=False,
-        task_label="60to30",
     )
     mock_from_days.assert_not_called()
 

api/tests/unit_tests/controllers/console/app/test_app_apis.py

@@ -398,7 +398,6 @@ class TestWorkflowDraftVariableEndpoints:
         method = _unwrap(api.get)
 
         monkeypatch.setattr(workflow_draft_variable_module, "db", SimpleNamespace(engine=MagicMock()))
-        monkeypatch.setattr(workflow_draft_variable_module, "current_user", SimpleNamespace(id="user-1"))
 
         class DummySession:
             def __enter__(self):

api/tests/unit_tests/controllers/console/test_extension.py

@@ -22,7 +22,7 @@ from controllers.console.extension import (
 )
 
 if _NEEDS_METHOD_VIEW_CLEANUP:
-    del builtins.MethodView
+    delattr(builtins, "MethodView")
 from models.account import AccountStatus
 from models.api_based_extension import APIBasedExtension
 

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

@@ -234,7 +234,6 @@ class TestAdvancedChatAppGeneratorInternals:
         captured: dict[str, object] = {}
         prefill_calls: list[object] = []
         var_loader = SimpleNamespace(loader="draft")
-        workflow = SimpleNamespace(id="workflow-id")
 
         monkeypatch.setattr(
             "core.app.apps.advanced_chat.app_generator.AdvancedChatAppConfigManager.get_app_config",
@@ -261,8 +260,8 @@ class TestAdvancedChatAppGeneratorInternals:
             def __init__(self, session):
                 _ = session
 
-            def prefill_conversation_variable_default_values(self, workflow, user_id):
-                prefill_calls.append((workflow, user_id))
+            def prefill_conversation_variable_default_values(self, workflow):
+                prefill_calls.append(workflow)
 
         monkeypatch.setattr("core.app.apps.advanced_chat.app_generator.WorkflowDraftVariableService", _DraftVarService)
 
@@ -274,7 +273,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         result = generator.single_iteration_generate(
             app_model=SimpleNamespace(id="app", tenant_id="tenant"),
-            workflow=workflow,
+            workflow=SimpleNamespace(id="workflow-id"),
             node_id="node-1",
             user=SimpleNamespace(id="user-id"),
             args={"inputs": {"foo": "bar"}},
@@ -282,7 +281,7 @@ class TestAdvancedChatAppGeneratorInternals:
         )
 
         assert result == {"ok": True}
-        assert prefill_calls == [(workflow, "user-id")]
+        assert prefill_calls
         assert captured["variable_loader"] is var_loader
         assert captured["application_generate_entity"].single_iteration_run.node_id == "node-1"
 
@@ -292,7 +291,6 @@ class TestAdvancedChatAppGeneratorInternals:
         captured: dict[str, object] = {}
         prefill_calls: list[object] = []
         var_loader = SimpleNamespace(loader="draft")
-        workflow = SimpleNamespace(id="workflow-id")
 
         monkeypatch.setattr(
             "core.app.apps.advanced_chat.app_generator.AdvancedChatAppConfigManager.get_app_config",
@@ -319,8 +317,8 @@ class TestAdvancedChatAppGeneratorInternals:
             def __init__(self, session):
                 _ = session
 
-            def prefill_conversation_variable_default_values(self, workflow, user_id):
-                prefill_calls.append((workflow, user_id))
+            def prefill_conversation_variable_default_values(self, workflow):
+                prefill_calls.append(workflow)
 
         monkeypatch.setattr("core.app.apps.advanced_chat.app_generator.WorkflowDraftVariableService", _DraftVarService)
 
@@ -332,7 +330,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         result = generator.single_loop_generate(
             app_model=SimpleNamespace(id="app", tenant_id="tenant"),
-            workflow=workflow,
+            workflow=SimpleNamespace(id="workflow-id"),
             node_id="node-2",
             user=SimpleNamespace(id="user-id"),
             args=SimpleNamespace(inputs={"foo": "bar"}),
@@ -340,7 +338,7 @@ class TestAdvancedChatAppGeneratorInternals:
         )
 
         assert result == {"ok": True}
-        assert prefill_calls == [(workflow, "user-id")]
+        assert prefill_calls
         assert captured["variable_loader"] is var_loader
         assert captured["application_generate_entity"].single_loop_run.node_id == "node-2"
 

api/tests/unit_tests/core/entities/test_entities_provider_configuration.py

@@ -734,7 +734,7 @@ def test_create_provider_credential_creates_provider_record_when_missing() -> No
 def test_create_provider_credential_marks_existing_provider_as_valid() -> None:
     configuration = _build_provider_configuration()
     session = Mock()
-    provider_record = SimpleNamespace(id="provider-1", is_valid=False, credential_id="existing-cred")
+    provider_record = SimpleNamespace(is_valid=False)
 
     with _patched_session(session):
         with patch.object(ProviderConfiguration, "_check_provider_credential_name_exists", return_value=False):
@@ -743,25 +743,6 @@ def test_create_provider_credential_marks_existing_provider_as_valid() -> None:
                     configuration.create_provider_credential({"api_key": "raw"}, "Main")
 
     assert provider_record.is_valid is True
-    assert provider_record.credential_id == "existing-cred"
-    session.commit.assert_called_once()
-
-
-def test_create_provider_credential_auto_activates_when_no_active_credential() -> None:
-    configuration = _build_provider_configuration()
-    session = Mock()
-    provider_record = SimpleNamespace(id="provider-1", is_valid=False, credential_id=None, updated_at=None)
-
-    with _patched_session(session):
-        with patch.object(ProviderConfiguration, "_check_provider_credential_name_exists", return_value=False):
-            with patch.object(ProviderConfiguration, "validate_provider_credentials", return_value={"api_key": "enc"}):
-                with patch.object(ProviderConfiguration, "_get_provider_record", return_value=provider_record):
-                    with patch("core.entities.provider_configuration.ProviderCredentialsCache"):
-                        with patch.object(ProviderConfiguration, "switch_preferred_provider_type"):
-                            configuration.create_provider_credential({"api_key": "raw"}, "Main")
-
-    assert provider_record.is_valid is True
-    assert provider_record.credential_id is not None
     session.commit.assert_called_once()
 
 

api/tests/unit_tests/core/mcp/auth/test_auth_flow.py

@@ -801,27 +801,6 @@ class TestAuthOrchestration:
         urls = build_protected_resource_metadata_discovery_urls(None, "https://api.example.com")
         assert urls == ["https://api.example.com/.well-known/oauth-protected-resource"]
 
-    def test_build_protected_resource_metadata_discovery_urls_with_relative_hint(self):
-        urls = build_protected_resource_metadata_discovery_urls(
-            "/.well-known/oauth-protected-resource/tenant/mcp",
-            "https://api.example.com/tenant/mcp",
-        )
-        assert urls == [
-            "https://api.example.com/.well-known/oauth-protected-resource/tenant/mcp",
-            "https://api.example.com/.well-known/oauth-protected-resource",
-        ]
-
-    def test_build_protected_resource_metadata_discovery_urls_ignores_scheme_less_hint(self):
-        urls = build_protected_resource_metadata_discovery_urls(
-            "/openapi-mcp.cn-hangzhou.aliyuncs.com/.well-known/oauth-protected-resource/tenant/mcp",
-            "https://openapi-mcp.cn-hangzhou.aliyuncs.com/tenant/mcp",
-        )
-
-        assert urls == [
-            "https://openapi-mcp.cn-hangzhou.aliyuncs.com/.well-known/oauth-protected-resource/tenant/mcp",
-            "https://openapi-mcp.cn-hangzhou.aliyuncs.com/.well-known/oauth-protected-resource",
-        ]
-
     def test_build_oauth_authorization_server_metadata_discovery_urls(self):
         # Case 1: with auth_server_url
         urls = build_oauth_authorization_server_metadata_discovery_urls(

api/tests/unit_tests/core/rag/datasource/vdb/weaviate/test_weaviate_vector.py

@@ -11,7 +11,6 @@ import unittest
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
-from core.rag.datasource.vdb.weaviate import weaviate_vector as weaviate_vector_module
 from core.rag.datasource.vdb.weaviate.weaviate_vector import WeaviateConfig, WeaviateVector
 from core.rag.models.document import Document
 
@@ -20,7 +19,6 @@ class TestWeaviateVector(unittest.TestCase):
     """Tests for WeaviateVector class with focus on doc_type metadata handling."""
 
     def setUp(self):
-        weaviate_vector_module._weaviate_client = None
         self.config = WeaviateConfig(
             endpoint="http://localhost:8080",
             api_key="test-key",
@@ -29,9 +27,6 @@ class TestWeaviateVector(unittest.TestCase):
         self.collection_name = "Test_Collection_Node"
         self.attributes = ["doc_id", "dataset_id", "document_id", "doc_hash", "doc_type"]
 
-    def tearDown(self):
-        weaviate_vector_module._weaviate_client = None
-
     @patch("core.rag.datasource.vdb.weaviate.weaviate_vector.weaviate")
     def _create_weaviate_vector(self, mock_weaviate_module):
         """Helper to create a WeaviateVector instance with mocked client."""

api/tests/unit_tests/core/workflow/graph_engine/test_response_session.py

@@ -4,7 +4,9 @@ from __future__ import annotations
 
 import pytest
 
+import dify_graph.graph_engine.response_coordinator.session as response_session_module
 from dify_graph.enums import BuiltinNodeTypes, NodeExecutionType, NodeState, NodeType
+from dify_graph.graph_engine.response_coordinator import RESPONSE_SESSION_NODE_TYPES
 from dify_graph.graph_engine.response_coordinator.session import ResponseSession
 from dify_graph.nodes.base.template import Template, TextSegment
 
@@ -33,14 +35,28 @@ class DummyNodeWithoutStreamingTemplate:
         self.state = NodeState.UNKNOWN
 
 
-def test_response_session_from_node_accepts_nodes_outside_previous_allowlist() -> None:
-    """Session creation depends on the streaming-template contract rather than node type."""
+def test_response_session_from_node_rejects_node_types_outside_allowlist() -> None:
+    """Unsupported node types are rejected even if they expose a template."""
     node = DummyResponseNode(
         node_id="llm-node",
         node_type=BuiltinNodeTypes.LLM,
         template=Template(segments=[TextSegment(text="hello")]),
     )
 
+    with pytest.raises(TypeError, match="RESPONSE_SESSION_NODE_TYPES"):
+        ResponseSession.from_node(node)
+
+
+def test_response_session_from_node_supports_downstream_allowlist_extension(monkeypatch) -> None:
+    """Downstream applications can extend the supported node-type list."""
+    node = DummyResponseNode(
+        node_id="llm-node",
+        node_type=BuiltinNodeTypes.LLM,
+        template=Template(segments=[TextSegment(text="hello")]),
+    )
+    extended_node_types = [*RESPONSE_SESSION_NODE_TYPES, BuiltinNodeTypes.LLM]
+    monkeypatch.setattr(response_session_module, "RESPONSE_SESSION_NODE_TYPES", extended_node_types)
+
     session = ResponseSession.from_node(node)
 
     assert session.node_id == "llm-node"

api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py

@@ -14,64 +14,3 @@ def test_render_body_template_replaces_variable_values():
     result = config.render_body_template(body=config.body, url="https://example.com", variable_pool=variable_pool)
 
     assert result == "Hello World https://example.com"
-
-
-def test_render_markdown_body_renders_markdown_to_html():
-    rendered = EmailDeliveryConfig.render_markdown_body("**Bold** and [link](https://example.com)")
-
-    assert "<strong>Bold</strong>" in rendered
-    assert '<a href="https://example.com">link</a>' in rendered
-
-
-def test_render_markdown_body_sanitizes_unsafe_html():
-    rendered = EmailDeliveryConfig.render_markdown_body(
-        '<script>alert("xss")</script><a href="javascript:alert(1)" onclick="alert(2)">Click</a>'
-    )
-
-    assert "<script" not in rendered
-    assert "<a" not in rendered
-    assert "onclick" not in rendered
-    assert "javascript:" not in rendered
-    assert "Click" in rendered
-
-
-def test_render_markdown_body_sanitizes_markdown_link_with_javascript_href():
-    rendered = EmailDeliveryConfig.render_markdown_body("[bad](javascript:alert(1)) and [ok](https://example.com)")
-
-    assert "javascript:" not in rendered
-    assert "<a>bad</a>" in rendered
-    assert '<a href="https://example.com">ok</a>' in rendered
-
-
-def test_render_markdown_body_does_not_allow_raw_html_tags():
-    rendered = EmailDeliveryConfig.render_markdown_body("<b>raw html</b> and **markdown**")
-
-    assert "<b>" not in rendered
-    assert "raw html" in rendered
-    assert "<strong>markdown</strong>" in rendered
-
-
-def test_render_markdown_body_supports_table_syntax():
-    rendered = EmailDeliveryConfig.render_markdown_body("| h1 | h2 |\n| --- | ---: |\n| v1 | v2 |")
-
-    assert "<table>" in rendered
-    assert "<thead>" in rendered
-    assert "<tbody>" in rendered
-    assert 'align="right"' in rendered
-    assert "style=" not in rendered
-
-
-def test_sanitize_subject_removes_crlf():
-    sanitized = EmailDeliveryConfig.sanitize_subject("Notice\r\nBCC:attacker@example.com")
-
-    assert "\r" not in sanitized
-    assert "\n" not in sanitized
-    assert sanitized == "Notice BCC:attacker@example.com"
-
-
-def test_sanitize_subject_removes_html_tags():
-    sanitized = EmailDeliveryConfig.sanitize_subject("<b>Alert</b><img src=x onerror=1>")
-
-    assert "<" not in sanitized
-    assert ">" not in sanitized
-    assert sanitized == "Alert"

api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py

@@ -1,106 +0,0 @@
-from unittest import mock
-
-import pytest
-
-from core.model_manager import ModelInstance
-from dify_graph.model_runtime.entities import ImagePromptMessageContent, PromptMessageRole, TextPromptMessageContent
-from dify_graph.model_runtime.entities.message_entities import SystemPromptMessage
-from dify_graph.nodes.llm import llm_utils
-from dify_graph.nodes.llm.entities import LLMNodeChatModelMessage
-from dify_graph.nodes.llm.exc import NoPromptFoundError
-from dify_graph.runtime import VariablePool
-
-
-def _fetch_prompt_messages_with_mocked_content(content):
-    variable_pool = VariablePool.empty()
-    model_instance = mock.MagicMock(spec=ModelInstance)
-    prompt_template = [
-        LLMNodeChatModelMessage(
-            text="You are a classifier.",
-            role=PromptMessageRole.SYSTEM,
-            edition_type="basic",
-        )
-    ]
-
-    with (
-        mock.patch(
-            "dify_graph.nodes.llm.llm_utils.fetch_model_schema",
-            return_value=mock.MagicMock(features=[]),
-        ),
-        mock.patch(
-            "dify_graph.nodes.llm.llm_utils.handle_list_messages",
-            return_value=[SystemPromptMessage(content=content)],
-        ),
-        mock.patch(
-            "dify_graph.nodes.llm.llm_utils.handle_memory_chat_mode",
-            return_value=[],
-        ),
-    ):
-        return llm_utils.fetch_prompt_messages(
-            sys_query=None,
-            sys_files=[],
-            context=None,
-            memory=None,
-            model_instance=model_instance,
-            prompt_template=prompt_template,
-            stop=["END"],
-            memory_config=None,
-            vision_enabled=False,
-            vision_detail=ImagePromptMessageContent.DETAIL.HIGH,
-            variable_pool=variable_pool,
-            jinja2_variables=[],
-            template_renderer=None,
-        )
-
-
-def test_fetch_prompt_messages_skips_messages_when_all_contents_are_filtered_out():
-    with pytest.raises(NoPromptFoundError):
-        _fetch_prompt_messages_with_mocked_content(
-            [
-                ImagePromptMessageContent(
-                    format="url",
-                    url="https://example.com/image.png",
-                    mime_type="image/png",
-                ),
-            ]
-        )
-
-
-def test_fetch_prompt_messages_flattens_single_text_content_after_filtering_unsupported_multimodal_items():
-    prompt_messages, stop = _fetch_prompt_messages_with_mocked_content(
-        [
-            TextPromptMessageContent(data="You are a classifier."),
-            ImagePromptMessageContent(
-                format="url",
-                url="https://example.com/image.png",
-                mime_type="image/png",
-            ),
-        ]
-    )
-
-    assert stop == ["END"]
-    assert prompt_messages == [SystemPromptMessage(content="You are a classifier.")]
-
-
-def test_fetch_prompt_messages_keeps_list_content_when_multiple_supported_items_remain():
-    prompt_messages, stop = _fetch_prompt_messages_with_mocked_content(
-        [
-            TextPromptMessageContent(data="You are"),
-            TextPromptMessageContent(data=" a classifier."),
-            ImagePromptMessageContent(
-                format="url",
-                url="https://example.com/image.png",
-                mime_type="image/png",
-            ),
-        ]
-    )
-
-    assert stop == ["END"]
-    assert prompt_messages == [
-        SystemPromptMessage(
-            content=[
-                TextPromptMessageContent(data="You are"),
-                TextPromptMessageContent(data=" a classifier."),
-            ]
-        )
-    ]

api/tests/unit_tests/libs/test_login.py

@@ -140,7 +140,7 @@ class TestLoginRequired:
 
         # Remove ensure_sync to simulate Flask 1.x
         if hasattr(setup_app, "ensure_sync"):
-            del setup_app.ensure_sync
+            delattr(setup_app, "ensure_sync")
 
         with setup_app.test_request_context():
             mock_user = MockUser("test_user", is_authenticated=True)

api/tests/unit_tests/models/test_enums_creator_user_role.py

@@ -1,19 +0,0 @@
-import pytest
-
-from models.enums import CreatorUserRole
-
-
-def test_creator_user_role_missing_maps_hyphen_to_enum():
-    # given an alias with hyphen
-    value = "end-user"
-
-    # when converting to enum (invokes StrEnum._missing_ override)
-    role = CreatorUserRole(value)
-
-    # then it should map to END_USER
-    assert role is CreatorUserRole.END_USER
-
-
-def test_creator_user_role_missing_raises_for_unknown():
-    with pytest.raises(ValueError):
-        CreatorUserRole("unknown")

api/tests/unit_tests/services/retention/conversation/test_messages_clean_service.py

@@ -1,4 +1,5 @@
 import datetime
+import os
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -281,6 +282,7 @@ class TestMessagesCleanService:
         MessagesCleanService._batch_delete_message_relations(mock_db_session, ["msg1", "msg2"])
         assert mock_db_session.execute.call_count == 8  # 8 tables to clean up
 
+    @patch.dict(os.environ, {"SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL": "500"})
     def test_clean_messages_interval_from_env(self, mock_db_session, mock_policy):
         service = MessagesCleanService(
             policy=mock_policy,
@@ -299,13 +301,9 @@ class TestMessagesCleanService:
         mock_db_session.execute.side_effect = mock_returns
         mock_policy.filter_message_ids.return_value = ["msg1"]
 
-        with patch(
-            "services.retention.conversation.messages_clean_service.dify_config.SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL",
-            500,
-        ):
-            with patch("services.retention.conversation.messages_clean_service.time.sleep") as mock_sleep:
-                with patch("services.retention.conversation.messages_clean_service.random.uniform") as mock_uniform:
-                    mock_uniform.return_value = 300.0
-                    service.run()
-                    mock_uniform.assert_called_with(0, 500)
-                    mock_sleep.assert_called_with(0.3)
+        with patch("services.retention.conversation.messages_clean_service.time.sleep") as mock_sleep:
+            with patch("services.retention.conversation.messages_clean_service.random.uniform") as mock_uniform:
+                mock_uniform.return_value = 300.0
+                service.run()
+                mock_uniform.assert_called_with(0, 500)
+                mock_sleep.assert_called_with(0.3)

api/tests/unit_tests/services/retention/workflow_run/test_clear_free_plan_expired_workflow_run_logs.py

@@ -80,13 +80,7 @@ class TestWorkflowRunCleanupInit:
             cfg.SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD = 0
             cfg.BILLING_ENABLED = False
             with pytest.raises(ValueError):
-                WorkflowRunCleanup(
-                    days=30,
-                    batch_size=10,
-                    start_from=dt,
-                    end_before=dt,
-                    workflow_run_repo=mock_repo,
-                )
+                WorkflowRunCleanup(days=30, batch_size=10, start_from=dt, end_before=dt, workflow_run_repo=mock_repo)
 
     def test_zero_batch_size_raises(self, mock_repo):
         with patch("services.retention.workflow_run.clear_free_plan_expired_workflow_run_logs.dify_config") as cfg:
@@ -108,24 +102,10 @@ class TestWorkflowRunCleanupInit:
             cfg.BILLING_ENABLED = False
             start = datetime.datetime(2024, 1, 1)
             end = datetime.datetime(2024, 6, 1)
-            c = WorkflowRunCleanup(
-                days=30,
-                batch_size=5,
-                start_from=start,
-                end_before=end,
-                workflow_run_repo=mock_repo,
-            )
+            c = WorkflowRunCleanup(days=30, batch_size=5, start_from=start, end_before=end, workflow_run_repo=mock_repo)
             assert c.window_start == start
             assert c.window_end == end
 
-    def test_default_task_label_is_custom(self, mock_repo):
-        with patch("services.retention.workflow_run.clear_free_plan_expired_workflow_run_logs.dify_config") as cfg:
-            cfg.SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD = 0
-            cfg.BILLING_ENABLED = False
-            c = WorkflowRunCleanup(days=30, batch_size=10, workflow_run_repo=mock_repo)
-
-        assert c._metrics._base_attributes["task_label"] == "custom"
-
 
 # ---------------------------------------------------------------------------
 # _empty_related_counts / _format_related_counts
@@ -413,12 +393,7 @@ class TestRunDryRunMode:
         with patch("services.retention.workflow_run.clear_free_plan_expired_workflow_run_logs.dify_config") as cfg:
             cfg.SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD = 0
             cfg.BILLING_ENABLED = False
-            return WorkflowRunCleanup(
-                days=30,
-                batch_size=10,
-                workflow_run_repo=mock_repo,
-                dry_run=True,
-            )
+            return WorkflowRunCleanup(days=30, batch_size=10, workflow_run_repo=mock_repo, dry_run=True)
 
     def test_dry_run_no_delete_called(self, mock_repo):
         run = make_run("t1")

api/tests/unit_tests/services/test_app_dsl_service.py

@@ -263,7 +263,7 @@ def test_import_app_completed_uses_declared_dependencies(monkeypatch):
 
     assert result.status == ImportStatus.COMPLETED
     assert result.app_id == "app-new"
-    draft_var_service.delete_app_workflow_variables.assert_called_once_with(app_id="app-new")
+    draft_var_service.delete_workflow_variables.assert_called_once_with(app_id="app-new")
 
 
 @pytest.mark.parametrize("has_workflow", [True, False])
@@ -305,7 +305,7 @@ def test_import_app_legacy_versions_extract_dependencies(monkeypatch, has_workfl
         account=_account_mock(), import_mode=ImportMode.YAML_CONTENT, yaml_content=_yaml_dump(data)
     )
     assert result.status == ImportStatus.COMPLETED_WITH_WARNINGS
-    draft_var_service.delete_app_workflow_variables.assert_called_once_with(app_id="app-legacy")
+    draft_var_service.delete_workflow_variables.assert_called_once_with(app_id="app-legacy")
 
 
 def test_import_app_yaml_error_returns_failed(monkeypatch):

api/tests/unit_tests/services/test_clear_free_plan_expired_workflow_run_logs.py

@@ -265,61 +265,6 @@ def test_run_exits_on_empty_batch(monkeypatch: pytest.MonkeyPatch) -> None:
     cleanup.run()
 
 
-def test_run_records_metrics_on_success(monkeypatch: pytest.MonkeyPatch) -> None:
-    cutoff = datetime.datetime.now()
-    repo = FakeRepo(
-        batches=[[FakeRun("run-free", "t_free", cutoff)]],
-        delete_result={
-            "runs": 0,
-            "node_executions": 2,
-            "offloads": 1,
-            "app_logs": 3,
-            "trigger_logs": 4,
-            "pauses": 5,
-            "pause_reasons": 6,
-        },
-    )
-    cleanup = create_cleanup(monkeypatch, repo=repo, days=30, batch_size=10)
-    monkeypatch.setattr(cleanup_module.dify_config, "BILLING_ENABLED", False)
-
-    batch_calls: list[dict[str, object]] = []
-    completion_calls: list[dict[str, object]] = []
-    monkeypatch.setattr(cleanup._metrics, "record_batch", lambda **kwargs: batch_calls.append(kwargs))
-    monkeypatch.setattr(cleanup._metrics, "record_completion", lambda **kwargs: completion_calls.append(kwargs))
-
-    cleanup.run()
-
-    assert len(batch_calls) == 1
-    assert batch_calls[0]["batch_rows"] == 1
-    assert batch_calls[0]["targeted_runs"] == 1
-    assert batch_calls[0]["deleted_runs"] == 1
-    assert batch_calls[0]["related_action"] == "deleted"
-    assert len(completion_calls) == 1
-    assert completion_calls[0]["status"] == "success"
-
-
-def test_run_records_failed_metrics(monkeypatch: pytest.MonkeyPatch) -> None:
-    class FailingRepo(FakeRepo):
-        def delete_runs_with_related(
-            self, runs: list[FakeRun], delete_node_executions=None, delete_trigger_logs=None
-        ) -> dict[str, int]:
-            raise RuntimeError("delete failed")
-
-    cutoff = datetime.datetime.now()
-    repo = FailingRepo(batches=[[FakeRun("run-free", "t_free", cutoff)]])
-    cleanup = create_cleanup(monkeypatch, repo=repo, days=30, batch_size=10)
-    monkeypatch.setattr(cleanup_module.dify_config, "BILLING_ENABLED", False)
-
-    completion_calls: list[dict[str, object]] = []
-    monkeypatch.setattr(cleanup._metrics, "record_completion", lambda **kwargs: completion_calls.append(kwargs))
-
-    with pytest.raises(RuntimeError, match="delete failed"):
-        cleanup.run()
-
-    assert len(completion_calls) == 1
-    assert completion_calls[0]["status"] == "failed"
-
-
 def test_run_dry_run_skips_deletions(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
     cutoff = datetime.datetime.now()
     repo = FakeRepo(

api/tests/unit_tests/services/test_human_input_delivery_test_service.py

@@ -207,45 +207,6 @@ class TestEmailDeliveryTestHandler:
         assert kwargs["to"] == "test@example.com"
         assert "RENDERED_Subj" in kwargs["subject"]
 
-    def test_send_test_sanitizes_subject(self, monkeypatch):
-        monkeypatch.setattr(
-            service_module.FeatureService,
-            "get_features",
-            lambda _id: SimpleNamespace(human_input_email_delivery_enabled=True),
-        )
-        monkeypatch.setattr(service_module.mail, "is_inited", lambda: True)
-        mock_mail_send = MagicMock()
-        monkeypatch.setattr(service_module.mail, "send", mock_mail_send)
-        monkeypatch.setattr(
-            service_module,
-            "render_email_template",
-            lambda template, substitutions: template.replace("{{ recipient_email }}", substitutions["recipient_email"]),
-        )
-
-        handler = EmailDeliveryTestHandler(session_factory=MagicMock())
-        handler._resolve_recipients = MagicMock(return_value=["test@example.com"])
-
-        context = DeliveryTestContext(
-            tenant_id="t1",
-            app_id="a1",
-            node_id="n1",
-            node_title="title",
-            rendered_content="content",
-            recipients=[DeliveryTestEmailRecipient(email="test@example.com", form_token="token123")],
-        )
-        method = EmailDeliveryMethod(
-            config=EmailDeliveryConfig(
-                recipients=EmailRecipients(whole_workspace=False, items=[]),
-                subject="<b>Notice</b>\r\nBCC:{{ recipient_email }}",
-                body="Body",
-            )
-        )
-
-        handler.send_test(context=context, method=method)
-
-        _, kwargs = mock_mail_send.call_args
-        assert kwargs["subject"] == "Notice BCC:test@example.com"
-
     def test_resolve_recipients(self):
         handler = EmailDeliveryTestHandler(session_factory=MagicMock())
 

api/tests/unit_tests/services/test_messages_clean_service.py

@@ -540,20 +540,6 @@ class TestMessagesCleanServiceFromTimeRange:
         assert service._batch_size == 1000  # default
         assert service._dry_run is False  # default
 
-    def test_explicit_task_label(self):
-        start_from = datetime.datetime(2024, 1, 1)
-        end_before = datetime.datetime(2024, 1, 2)
-        policy = BillingDisabledPolicy()
-
-        service = MessagesCleanService.from_time_range(
-            policy=policy,
-            start_from=start_from,
-            end_before=end_before,
-            task_label="60to30",
-        )
-
-        assert service._metrics._base_attributes["task_label"] == "60to30"
-
 
 class TestMessagesCleanServiceFromDays:
     """Unit tests for MessagesCleanService.from_days factory method."""
@@ -633,54 +619,3 @@ class TestMessagesCleanServiceFromDays:
         assert service._end_before == expected_end_before
         assert service._batch_size == 1000  # default
         assert service._dry_run is False  # default
-        assert service._metrics._base_attributes["task_label"] == "custom"
-
-
-class TestMessagesCleanServiceRun:
-    """Unit tests for MessagesCleanService.run instrumentation behavior."""
-
-    def test_run_records_completion_metrics_on_success(self):
-        # Arrange
-        service = MessagesCleanService(
-            policy=BillingDisabledPolicy(),
-            start_from=datetime.datetime(2024, 1, 1),
-            end_before=datetime.datetime(2024, 1, 2),
-            batch_size=100,
-            dry_run=False,
-        )
-        expected_stats = {
-            "batches": 1,
-            "total_messages": 10,
-            "filtered_messages": 5,
-            "total_deleted": 5,
-        }
-        service._clean_messages_by_time_range = MagicMock(return_value=expected_stats)  # type: ignore[method-assign]
-        completion_calls: list[dict[str, object]] = []
-        service._metrics.record_completion = lambda **kwargs: completion_calls.append(kwargs)  # type: ignore[method-assign]
-
-        # Act
-        result = service.run()
-
-        # Assert
-        assert result == expected_stats
-        assert len(completion_calls) == 1
-        assert completion_calls[0]["status"] == "success"
-
-    def test_run_records_completion_metrics_on_failure(self):
-        # Arrange
-        service = MessagesCleanService(
-            policy=BillingDisabledPolicy(),
-            start_from=datetime.datetime(2024, 1, 1),
-            end_before=datetime.datetime(2024, 1, 2),
-            batch_size=100,
-            dry_run=False,
-        )
-        service._clean_messages_by_time_range = MagicMock(side_effect=RuntimeError("clean failed"))  # type: ignore[method-assign]
-        completion_calls: list[dict[str, object]] = []
-        service._metrics.record_completion = lambda **kwargs: completion_calls.append(kwargs)  # type: ignore[method-assign]
-
-        # Act & Assert
-        with pytest.raises(RuntimeError, match="clean failed"):
-            service.run()
-        assert len(completion_calls) == 1
-        assert completion_calls[0]["status"] == "failed"

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

@@ -24,11 +24,7 @@ class TestDraftVarLoaderSimple:
     def draft_var_loader(self, mock_engine):
         """Create DraftVarLoader instance for testing."""
         return DraftVarLoader(
-            engine=mock_engine,
-            app_id="test-app-id",
-            tenant_id="test-tenant-id",
-            user_id="test-user-id",
-            fallback_variables=[],
+            engine=mock_engine, app_id="test-app-id", tenant_id="test-tenant-id", fallback_variables=[]
         )
 
     def test_load_offloaded_variable_string_type_unit(self, draft_var_loader):
@@ -327,9 +323,7 @@ class TestDraftVarLoaderSimple:
 
                                     # Verify service method was called
                                     mock_service.get_draft_variables_by_selectors.assert_called_once_with(
-                                        draft_var_loader._app_id,
-                                        selectors,
-                                        user_id=draft_var_loader._user_id,
+                                        draft_var_loader._app_id, selectors
                                     )
 
                                     # Verify offloaded variable loading was called

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

@@ -8,7 +8,7 @@ from sqlalchemy import Engine
 from sqlalchemy.orm import Session
 
 from dify_graph.constants import SYSTEM_VARIABLE_NODE_ID
-from dify_graph.enums import BuiltinNodeTypes, SystemVariableKey
+from dify_graph.enums import BuiltinNodeTypes
 from dify_graph.variables.segments import StringSegment
 from dify_graph.variables.types import SegmentType
 from libs.uuid_utils import uuidv7
@@ -182,42 +182,6 @@ class TestDraftVariableSaver:
         draft_vars = mock_batch_upsert.call_args[0][1]
         assert len(draft_vars) == 2
 
-    @patch("services.workflow_draft_variable_service._batch_upsert_draft_variable", autospec=True)
-    def test_start_node_save_persists_sys_timestamp_and_workflow_run_id(self, mock_batch_upsert):
-        """Start node should persist common `sys.*` variables, not only `sys.files`."""
-        mock_session = MagicMock(spec=Session)
-        mock_user = MagicMock(spec=Account)
-        mock_user.id = "test-user-id"
-        mock_user.tenant_id = "test-tenant-id"
-
-        saver = DraftVariableSaver(
-            session=mock_session,
-            app_id="test-app-id",
-            node_id="start-node-id",
-            node_type=BuiltinNodeTypes.START,
-            node_execution_id="exec-id",
-            user=mock_user,
-        )
-
-        outputs = {
-            f"{SYSTEM_VARIABLE_NODE_ID}.{SystemVariableKey.TIMESTAMP}": 1700000000,
-            f"{SYSTEM_VARIABLE_NODE_ID}.{SystemVariableKey.WORKFLOW_EXECUTION_ID}": "run-id-123",
-        }
-
-        saver.save(outputs=outputs)
-
-        mock_batch_upsert.assert_called_once()
-        draft_vars = mock_batch_upsert.call_args[0][1]
-
-        # plus one dummy output because there are no non-sys Start inputs
-        assert len(draft_vars) == 3
-
-        sys_vars = [v for v in draft_vars if v.node_id == SYSTEM_VARIABLE_NODE_ID]
-        assert {v.name for v in sys_vars} == {
-            str(SystemVariableKey.TIMESTAMP),
-            str(SystemVariableKey.WORKFLOW_EXECUTION_ID),
-        }
-
 
 class TestWorkflowDraftVariableService:
     def _get_test_app_id(self):

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

@@ -245,7 +245,6 @@ class TestWorkflowService:
             workflow=workflow,
             node_config=node_config,
             manual_inputs={"#node-0.result#": "LLM output"},
-            user_id="account-1",
         )
 
         node.render_form_content_with_outputs.assert_called_once()

api/tests/unit_tests/tasks/test_mail_human_input_delivery_task.py

@@ -120,37 +120,4 @@ def test_dispatch_human_input_email_task_replaces_body_variables(monkeypatch: py
         session_factory=lambda: _DummySession(form),
     )
 
-    assert mail.sent[0]["html"] == "<p>Body OK</p>"
-
-
-@pytest.mark.parametrize("line_break", ["\r\n", "\r", "\n"])
-def test_dispatch_human_input_email_task_sanitizes_subject(
-    monkeypatch: pytest.MonkeyPatch,
-    line_break: str,
-):
-    mail = _DummyMail()
-    form = SimpleNamespace(id="form-1", tenant_id="tenant-1", workflow_run_id=None)
-    job = task_module._EmailDeliveryJob(
-        form_id="form-1",
-        subject=f"Notice{line_break}BCC:attacker@example.com <b>Alert</b>",
-        body="Body",
-        form_content="content",
-        recipients=[task_module._EmailRecipient(email="user@example.com", token="token-1")],
-    )
-
-    monkeypatch.setattr(task_module, "mail", mail)
-    monkeypatch.setattr(
-        task_module.FeatureService,
-        "get_features",
-        lambda _tenant_id: SimpleNamespace(human_input_email_delivery_enabled=True),
-    )
-    monkeypatch.setattr(task_module, "_load_email_jobs", lambda _session, _form: [job])
-    monkeypatch.setattr(task_module, "_load_variable_pool", lambda _workflow_run_id: None)
-
-    task_module.dispatch_human_input_email_task(
-        form_id="form-1",
-        node_title="Approve",
-        session_factory=lambda: _DummySession(form),
-    )
-
-    assert mail.sent[0]["subject"] == "Notice BCC:attacker@example.com Alert"
+    assert mail.sent[0]["html"] == "Body OK"

api/uv.lock

@@ -457,14 +457,14 @@ wheels = [
 
 [[package]]
 name = "authlib"
-version = "1.6.9"
+version = "1.6.7"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/af/98/00d3dd826d46959ad8e32af2dbb2398868fd9fd0683c26e56d0789bd0e68/authlib-1.6.9.tar.gz", hash = "sha256:d8f2421e7e5980cc1ddb4e32d3f5fa659cfaf60d8eaf3281ebed192e4ab74f04", size = 165134, upload-time = "2026-03-02T07:44:01.998Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/49/dc/ed1681bf1339dd6ea1ce56136bad4baabc6f7ad466e375810702b0237047/authlib-1.6.7.tar.gz", hash = "sha256:dbf10100011d1e1b34048c9d120e83f13b35d69a826ae762b93d2fb5aafc337b", size = 164950, upload-time = "2026-02-06T14:04:14.171Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/53/23/b65f568ed0c22f1efacb744d2db1a33c8068f384b8c9b482b52ebdbc3ef6/authlib-1.6.9-py2.py3-none-any.whl", hash = "sha256:f08b4c14e08f0861dc18a32357b33fbcfd2ea86cfe3fe149484b4d764c4a0ac3", size = 244197, upload-time = "2026-03-02T07:44:00.307Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/00/3ed12264094ec91f534fae429945efbaa9f8c666f3aa7061cc3b2a26a0cd/authlib-1.6.7-py2.py3-none-any.whl", hash = "sha256:c637340d9a02789d2efa1d003a7437d10d3e565237bcb5fcbc6c134c7b95bab0", size = 244115, upload-time = "2026-02-06T14:04:12.141Z" },
 ]
 
 [[package]]
@@ -658,18 +658,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b3/cc/38b6f87170908bd8aaf9e412b021d17e85f690abe00edf50192f1a4566b9/billiard-4.2.3-py3-none-any.whl", hash = "sha256:989e9b688e3abf153f307b68a1328dfacfb954e30a4f920005654e276c69236b", size = 87042, upload-time = "2025-11-16T17:47:29.005Z" },
 ]
 
-[[package]]
-name = "bleach"
-version = "6.2.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "webencodings" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/76/9a/0e33f5054c54d349ea62c277191c020c2d6ef1d65ab2cb1993f91ec846d1/bleach-6.2.0.tar.gz", hash = "sha256:123e894118b8a599fd80d3ec1a6d4cc7ce4e5882b1317a7e1ba69b56e95f991f", size = 203083, upload-time = "2024-10-29T18:30:40.477Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/fc/55/96142937f66150805c25c4d0f31ee4132fd33497753400734f9dfdcbdc66/bleach-6.2.0-py3-none-any.whl", hash = "sha256:117d9c6097a7c3d22fd578fcd8d35ff1e125df6736f554da4e432fdd63f31e5e", size = 163406, upload-time = "2024-10-29T18:30:38.186Z" },
-]
-
 [[package]]
 name = "blinker"
 version = "1.9.0"
@@ -720,16 +708,16 @@ wheels = [
 
 [[package]]
 name = "boto3-stubs"
-version = "1.42.68"
+version = "1.41.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore-stubs" },
     { name = "types-s3transfer" },
     { name = "typing-extensions", marker = "python_full_version < '3.12'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/4c/8c/dd4b0c95ff008bed5a35ab411452ece121b355539d2a0b6dcd62a0c47be5/boto3_stubs-1.42.68.tar.gz", hash = "sha256:96ad1020735619483fb9b4da7a5e694b460bf2e18f84a34d5d175d0ffe8c4653", size = 101372, upload-time = "2026-03-13T19:49:54.867Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fd/5b/6d274aa25f7fa09f8b7defab5cb9389e6496a7d9b76c1efcf27b0b15e868/boto3_stubs-1.41.3.tar.gz", hash = "sha256:c7cc9706ac969c8ea284c2d45ec45b6371745666d087c6c5e7c9d39dafdd48bc", size = 100010, upload-time = "2025-11-24T20:34:27.052Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/68/15/3ca5848917214a168134512a5b45f856a56e913659888947a052e02031b5/boto3_stubs-1.42.68-py3-none-any.whl", hash = "sha256:ed7f98334ef7b2377fa8532190e63dc2c6d1dc895e3d7cb3d6d1c83771b81bf6", size = 70011, upload-time = "2026-03-13T19:49:42.801Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/d6/ef971013d1fc7333c6df322d98ebf4592df9c80e1966fb12732f91e9e71b/boto3_stubs-1.41.3-py3-none-any.whl", hash = "sha256:bec698419b31b499f3740f1dfb6dae6519167d9e3aa536f6f730ed280556230b", size = 69294, upload-time = "2025-11-24T20:34:23.1Z" },
 ]
 
 [package.optional-dependencies]
@@ -1533,7 +1521,7 @@ wheels = [
 
 [[package]]
 name = "dify-api"
-version = "1.13.2"
+version = "1.13.0"
 source = { virtual = "." }
 dependencies = [
     { name = "aliyun-log-python-sdk" },
@@ -1541,7 +1529,6 @@ dependencies = [
     { name = "arize-phoenix-otel" },
     { name = "azure-identity" },
     { name = "beautifulsoup4" },
-    { name = "bleach" },
     { name = "boto3" },
     { name = "bs4" },
     { name = "cachetools" },
@@ -1743,7 +1730,6 @@ requires-dist = [
     { name = "arize-phoenix-otel", specifier = "~=0.15.0" },
     { name = "azure-identity", specifier = "==1.25.3" },
     { name = "beautifulsoup4", specifier = "==4.14.3" },
-    { name = "bleach", specifier = "~=6.2.0" },
     { name = "boto3", specifier = "==1.42.68" },
     { name = "bs4", specifier = "~=0.0.1" },
     { name = "cachetools", specifier = "~=5.3.0" },
@@ -1845,7 +1831,7 @@ dev = [
     { name = "pytest", specifier = "~=9.0.2" },
     { name = "pytest-benchmark", specifier = "~=5.2.3" },
     { name = "pytest-cov", specifier = "~=7.0.0" },
-    { name = "pytest-env", specifier = "~=1.6.0" },
+    { name = "pytest-env", specifier = "~=1.1.3" },
     { name = "pytest-mock", specifier = "~=3.15.1" },
     { name = "pytest-timeout", specifier = ">=2.4.0" },
     { name = "pytest-xdist", specifier = ">=3.8.0" },
@@ -3157,14 +3143,14 @@ wheels = [
 
 [[package]]
 name = "hypothesis"
-version = "6.151.9"
+version = "6.148.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "sortedcontainers" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/19/e1/ef365ff480903b929d28e057f57b76cae51a30375943e33374ec9a165d9c/hypothesis-6.151.9.tar.gz", hash = "sha256:2f284428dda6c3c48c580de0e18470ff9c7f5ef628a647ee8002f38c3f9097ca", size = 463534, upload-time = "2026-02-16T22:59:23.09Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4a/99/a3c6eb3fdd6bfa01433d674b0f12cd9102aa99630689427422d920aea9c6/hypothesis-6.148.2.tar.gz", hash = "sha256:07e65d34d687ddff3e92a3ac6b43966c193356896813aec79f0a611c5018f4b1", size = 469984, upload-time = "2025-11-18T20:21:17.047Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c4/f7/5cc291d701094754a1d327b44d80a44971e13962881d9a400235726171da/hypothesis-6.151.9-py3-none-any.whl", hash = "sha256:7b7220585c67759b1b1ef839b1e6e9e3d82ed468cfc1ece43c67184848d7edd9", size = 529307, upload-time = "2026-02-16T22:59:20.443Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/d2/c2673aca0127e204965e0e9b3b7a0e91e9b12993859ac8758abd22669b89/hypothesis-6.148.2-py3-none-any.whl", hash = "sha256:bf8ddc829009da73b321994b902b1964bcc3e5c3f0ed9a1c1e6a1631ab97c5fa", size = 536986, upload-time = "2025-11-18T20:21:15.212Z" },
 ]
 
 [[package]]
@@ -3178,17 +3164,19 @@ wheels = [
 
 [[package]]
 name = "import-linter"
-version = "2.11"
+version = "2.10"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "click" },
+    { name = "fastapi" },
     { name = "grimp" },
     { name = "rich" },
     { name = "typing-extensions" },
+    { name = "uvicorn" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ba/66/55b697a17bb15c6cb88d97d73716813f5427281527b90f02cc0a600abc6e/import_linter-2.11.tar.gz", hash = "sha256:5abc3394797a54f9bae315e7242dc98715ba485f840ac38c6d3192c370d0085e", size = 1153682, upload-time = "2026-03-06T12:11:38.198Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/10/c4/a83cc1ea9ed0171725c0e2edc11fd929994d4f026028657e8b30d62bca37/import_linter-2.10.tar.gz", hash = "sha256:c6a5057d2dbd32e1854c4d6b60e90dfad459b7ab5356230486d8521f25872963", size = 1149263, upload-time = "2026-02-06T17:57:24.779Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e9/aa/2ed2c89543632ded7196e0d93dcc6c7fe87769e88391a648c4a298ea864a/import_linter-2.11-py3-none-any.whl", hash = "sha256:3dc54cae933bae3430358c30989762b721c77aa99d424f56a08265be0eeaa465", size = 637315, upload-time = "2026-03-06T12:11:36.599Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/e5/4b7b9435eac78ecfd537fa1004a0bcf0f4eac17d3a893f64d38a7bacb51b/import_linter-2.10-py3-none-any.whl", hash = "sha256:cc2ddd7ec0145cbf83f3b25391d2a5dbbf138382aaf80708612497fa6ebc8f60", size = 637081, upload-time = "2026-02-06T17:57:23.386Z" },
 ]
 
 [[package]]
@@ -3930,14 +3918,14 @@ wheels = [
 
 [[package]]
 name = "mypy-boto3-bedrock-runtime"
-version = "1.42.42"
+version = "1.41.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions", marker = "python_full_version < '3.12'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/46/bb/65dc1b2c5796a6ab5f60bdb57343bd6c3ecb82251c580eca415c8548333e/mypy_boto3_bedrock_runtime-1.42.42.tar.gz", hash = "sha256:3a4088218478b6fbbc26055c03c95bee4fc04624a801090b3cce3037e8275c8d", size = 29840, upload-time = "2026-02-04T20:53:05.999Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/af/f1/00aea4f91501728e7af7e899ce3a75d48d6df97daa720db11e46730fa123/mypy_boto3_bedrock_runtime-1.41.2.tar.gz", hash = "sha256:ba2c11f2f18116fd69e70923389ce68378fa1620f70e600efb354395a1a9e0e5", size = 28890, upload-time = "2025-11-21T20:35:30.074Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/00/43/7ea062f2228f47b5779dcfa14dab48d6e29f979b35d1a5102b0ba80b9c1b/mypy_boto3_bedrock_runtime-1.42.42-py3-none-any.whl", hash = "sha256:b2d16eae22607d0685f90796b3a0afc78c0b09d45872e00eafd634a31dd9358f", size = 36077, upload-time = "2026-02-04T20:53:01.768Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/cc/96a2af58c632701edb5be1dda95434464da43df40ae868a1ab1ddf033839/mypy_boto3_bedrock_runtime-1.41.2-py3-none-any.whl", hash = "sha256:a720ff1e98cf10723c37a61a46cff220b190c55b8fb57d4397e6cf286262cf02", size = 34967, upload-time = "2025-11-21T20:35:27.655Z" },
 ]
 
 [[package]]
@@ -5526,15 +5514,14 @@ wheels = [
 
 [[package]]
 name = "pytest-env"
-version = "1.6.0"
+version = "1.1.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pytest" },
-    { name = "python-dotenv" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ff/69/4db1c30625af0621df8dbe73797b38b6d1b04e15d021dd5d26a6d297f78c/pytest_env-1.6.0.tar.gz", hash = "sha256:ac02d6fba16af54d61e311dd70a3c61024a4e966881ea844affc3c8f0bf207d3", size = 16163, upload-time = "2026-03-12T22:39:43.78Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1f/31/27f28431a16b83cab7a636dce59cf397517807d247caa38ee67d65e71ef8/pytest_env-1.1.5.tar.gz", hash = "sha256:91209840aa0e43385073ac464a554ad2947cc2fd663a9debf88d03b01e0cc1cf", size = 8911, upload-time = "2024-09-17T22:39:18.566Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/27/16/ad52f56b96d851a2bcfdc1e754c3531341885bd7177a128c13ff2ca72ab4/pytest_env-1.6.0-py3-none-any.whl", hash = "sha256:1e7f8a62215e5885835daaed694de8657c908505b964ec8097a7ce77b403d9a3", size = 10400, upload-time = "2026-03-12T22:39:41.887Z" },
+    { url = "https://files.pythonhosted.org/packages/de/b8/87cfb16045c9d4092cfcf526135d73b88101aac83bc1adcf82dfb5fd3833/pytest_env-1.1.5-py3-none-any.whl", hash = "sha256:ce90cf8772878515c24b31cd97c7fa1f4481cd68d588419fd45f10ecaee6bc30", size = 6141, upload-time = "2024-09-17T22:39:16.942Z" },
 ]
 
 [[package]]
@@ -6046,27 +6033,27 @@ wheels = [
 
 [[package]]
 name = "ruff"
-version = "0.15.6"
+version = "0.15.5"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/51/df/f8629c19c5318601d3121e230f74cbee7a3732339c52b21daa2b82ef9c7d/ruff-0.15.6.tar.gz", hash = "sha256:8394c7bb153a4e3811a4ecdacd4a8e6a4fa8097028119160dffecdcdf9b56ae4", size = 4597916, upload-time = "2026-03-12T23:05:47.51Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/77/9b/840e0039e65fcf12758adf684d2289024d6140cde9268cc59887dc55189c/ruff-0.15.5.tar.gz", hash = "sha256:7c3601d3b6d76dce18c5c824fc8d06f4eef33d6df0c21ec7799510cde0f159a2", size = 4574214, upload-time = "2026-03-05T20:06:34.946Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/9e/2f/4e03a7e5ce99b517e98d3b4951f411de2b0fa8348d39cf446671adcce9a2/ruff-0.15.6-py3-none-linux_armv6l.whl", hash = "sha256:7c98c3b16407b2cf3d0f2b80c80187384bc92c6774d85fefa913ecd941256fff", size = 10508953, upload-time = "2026-03-12T23:05:17.246Z" },
-    { url = "https://files.pythonhosted.org/packages/70/60/55bcdc3e9f80bcf39edf0cd272da6fa511a3d94d5a0dd9e0adf76ceebdb4/ruff-0.15.6-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ee7dcfaad8b282a284df4aa6ddc2741b3f4a18b0555d626805555a820ea181c3", size = 10942257, upload-time = "2026-03-12T23:05:23.076Z" },
-    { url = "https://files.pythonhosted.org/packages/e7/f9/005c29bd1726c0f492bfa215e95154cf480574140cb5f867c797c18c790b/ruff-0.15.6-py3-none-macosx_11_0_arm64.whl", hash = "sha256:3bd9967851a25f038fc8b9ae88a7fbd1b609f30349231dffaa37b6804923c4bb", size = 10322683, upload-time = "2026-03-12T23:05:33.738Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/74/2f861f5fd7cbb2146bddb5501450300ce41562da36d21868c69b7a828169/ruff-0.15.6-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:13f4594b04e42cd24a41da653886b04d2ff87adbf57497ed4f728b0e8a4866f8", size = 10660986, upload-time = "2026-03-12T23:05:53.245Z" },
-    { url = "https://files.pythonhosted.org/packages/c1/a1/309f2364a424eccb763cdafc49df843c282609f47fe53aa83f38272389e0/ruff-0.15.6-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e2ed8aea2f3fe57886d3f00ea5b8aae5bf68d5e195f487f037a955ff9fbaac9e", size = 10332177, upload-time = "2026-03-12T23:05:56.145Z" },
-    { url = "https://files.pythonhosted.org/packages/30/41/7ebf1d32658b4bab20f8ac80972fb19cd4e2c6b78552be263a680edc55ac/ruff-0.15.6-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70789d3e7830b848b548aae96766431c0dc01a6c78c13381f423bf7076c66d15", size = 11170783, upload-time = "2026-03-12T23:06:01.742Z" },
-    { url = "https://files.pythonhosted.org/packages/76/be/6d488f6adca047df82cd62c304638bcb00821c36bd4881cfca221561fdfc/ruff-0.15.6-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:542aaf1de3154cea088ced5a819ce872611256ffe2498e750bbae5247a8114e9", size = 12044201, upload-time = "2026-03-12T23:05:28.697Z" },
-    { url = "https://files.pythonhosted.org/packages/71/68/e6f125df4af7e6d0b498f8d373274794bc5156b324e8ab4bf5c1b4fc0ec7/ruff-0.15.6-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c22e6f02c16cfac3888aa636e9eba857254d15bbacc9906c9689fdecb1953ab", size = 11421561, upload-time = "2026-03-12T23:05:31.236Z" },
-    { url = "https://files.pythonhosted.org/packages/f1/9f/f85ef5fd01a52e0b472b26dc1b4bd228b8f6f0435975442ffa4741278703/ruff-0.15.6-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98893c4c0aadc8e448cfa315bd0cc343a5323d740fe5f28ef8a3f9e21b381f7e", size = 11310928, upload-time = "2026-03-12T23:05:45.288Z" },
-    { url = "https://files.pythonhosted.org/packages/8c/26/b75f8c421f5654304b89471ed384ae8c7f42b4dff58fa6ce1626d7f2b59a/ruff-0.15.6-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:70d263770d234912374493e8cc1e7385c5d49376e41dfa51c5c3453169dc581c", size = 11235186, upload-time = "2026-03-12T23:05:50.677Z" },
-    { url = "https://files.pythonhosted.org/packages/fc/d4/d5a6d065962ff7a68a86c9b4f5500f7d101a0792078de636526c0edd40da/ruff-0.15.6-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:55a1ad63c5a6e54b1f21b7514dfadc0c7fb40093fa22e95143cf3f64ebdcd512", size = 10635231, upload-time = "2026-03-12T23:05:37.044Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/56/7c3acf3d50910375349016cf33de24be021532042afbed87942858992491/ruff-0.15.6-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:8dc473ba093c5ec238bb1e7429ee676dca24643c471e11fbaa8a857925b061c0", size = 10340357, upload-time = "2026-03-12T23:06:04.748Z" },
-    { url = "https://files.pythonhosted.org/packages/06/54/6faa39e9c1033ff6a3b6e76b5df536931cd30caf64988e112bbf91ef5ce5/ruff-0.15.6-py3-none-musllinux_1_2_i686.whl", hash = "sha256:85b042377c2a5561131767974617006f99f7e13c63c111b998f29fc1e58a4cfb", size = 10860583, upload-time = "2026-03-12T23:05:58.978Z" },
-    { url = "https://files.pythonhosted.org/packages/cb/1e/509a201b843b4dfb0b32acdedf68d951d3377988cae43949ba4c4133a96a/ruff-0.15.6-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:cef49e30bc5a86a6a92098a7fbf6e467a234d90b63305d6f3ec01225a9d092e0", size = 11410976, upload-time = "2026-03-12T23:05:39.955Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/25/3fc9114abf979a41673ce877c08016f8e660ad6cf508c3957f537d2e9fa9/ruff-0.15.6-py3-none-win32.whl", hash = "sha256:bbf67d39832404812a2d23020dda68fee7f18ce15654e96fb1d3ad21a5fe436c", size = 10616872, upload-time = "2026-03-12T23:05:42.451Z" },
-    { url = "https://files.pythonhosted.org/packages/89/7a/09ece68445ceac348df06e08bf75db72d0e8427765b96c9c0ffabc1be1d9/ruff-0.15.6-py3-none-win_amd64.whl", hash = "sha256:aee25bc84c2f1007ecb5037dff75cef00414fdf17c23f07dc13e577883dca406", size = 11787271, upload-time = "2026-03-12T23:05:20.168Z" },
-    { url = "https://files.pythonhosted.org/packages/7f/d0/578c47dd68152ddddddf31cd7fc67dc30b7cdf639a86275fda821b0d9d98/ruff-0.15.6-py3-none-win_arm64.whl", hash = "sha256:c34de3dd0b0ba203be50ae70f5910b17188556630e2178fd7d79fc030eb0d837", size = 11060497, upload-time = "2026-03-12T23:05:25.968Z" },
+    { url = "https://files.pythonhosted.org/packages/47/20/5369c3ce21588c708bcbe517a8fbe1a8dfdb5dfd5137e14790b1da71612c/ruff-0.15.5-py3-none-linux_armv6l.whl", hash = "sha256:4ae44c42281f42e3b06b988e442d344a5b9b72450ff3c892e30d11b29a96a57c", size = 10478185, upload-time = "2026-03-05T20:06:29.093Z" },
+    { url = "https://files.pythonhosted.org/packages/44/ed/e81dd668547da281e5dce710cf0bc60193f8d3d43833e8241d006720e42b/ruff-0.15.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:6edd3792d408ebcf61adabc01822da687579a1a023f297618ac27a5b51ef0080", size = 10859201, upload-time = "2026-03-05T20:06:32.632Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/8f/533075f00aaf19b07c5cd6aa6e5d89424b06b3b3f4583bfa9c640a079059/ruff-0.15.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:89f463f7c8205a9f8dea9d658d59eff49db05f88f89cc3047fb1a02d9f344010", size = 10184752, upload-time = "2026-03-05T20:06:40.312Z" },
+    { url = "https://files.pythonhosted.org/packages/66/0e/ba49e2c3fa0395b3152bad634c7432f7edfc509c133b8f4529053ff024fb/ruff-0.15.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba786a8295c6574c1116704cf0b9e6563de3432ac888d8f83685654fe528fd65", size = 10534857, upload-time = "2026-03-05T20:06:19.581Z" },
+    { url = "https://files.pythonhosted.org/packages/59/71/39234440f27a226475a0659561adb0d784b4d247dfe7f43ffc12dd02e288/ruff-0.15.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fd4b801e57955fe9f02b31d20375ab3a5c4415f2e5105b79fb94cf2642c91440", size = 10309120, upload-time = "2026-03-05T20:06:00.435Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/87/4140aa86a93df032156982b726f4952aaec4a883bb98cb6ef73c347da253/ruff-0.15.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:391f7c73388f3d8c11b794dbbc2959a5b5afe66642c142a6effa90b45f6f5204", size = 11047428, upload-time = "2026-03-05T20:05:51.867Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/f7/4953e7e3287676f78fbe85e3a0ca414c5ca81237b7575bdadc00229ac240/ruff-0.15.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8dc18f30302e379fe1e998548b0f5e9f4dff907f52f73ad6da419ea9c19d66c8", size = 11914251, upload-time = "2026-03-05T20:06:22.887Z" },
+    { url = "https://files.pythonhosted.org/packages/77/46/0f7c865c10cf896ccf5a939c3e84e1cfaeed608ff5249584799a74d33835/ruff-0.15.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1cc6e7f90087e2d27f98dc34ed1b3ab7c8f0d273cc5431415454e22c0bd2a681", size = 11333801, upload-time = "2026-03-05T20:05:57.168Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/01/a10fe54b653061585e655f5286c2662ebddb68831ed3eaebfb0eb08c0a16/ruff-0.15.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1cb7169f53c1ddb06e71a9aebd7e98fc0fea936b39afb36d8e86d36ecc2636a", size = 11206821, upload-time = "2026-03-05T20:06:03.441Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/0d/2132ceaf20c5e8699aa83da2706ecb5c5dcdf78b453f77edca7fb70f8a93/ruff-0.15.5-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:9b037924500a31ee17389b5c8c4d88874cc6ea8e42f12e9c61a3d754ff72f1ca", size = 11133326, upload-time = "2026-03-05T20:06:25.655Z" },
+    { url = "https://files.pythonhosted.org/packages/72/cb/2e5259a7eb2a0f87c08c0fe5bf5825a1e4b90883a52685524596bfc93072/ruff-0.15.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:65bb414e5b4eadd95a8c1e4804f6772bbe8995889f203a01f77ddf2d790929dd", size = 10510820, upload-time = "2026-03-05T20:06:37.79Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/20/b67ce78f9e6c59ffbdb5b4503d0090e749b5f2d31b599b554698a80d861c/ruff-0.15.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:d20aa469ae3b57033519c559e9bc9cd9e782842e39be05b50e852c7c981fa01d", size = 10302395, upload-time = "2026-03-05T20:05:54.504Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/e5/719f1acccd31b720d477751558ed74e9c88134adcc377e5e886af89d3072/ruff-0.15.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:15388dd28c9161cdb8eda68993533acc870aa4e646a0a277aa166de9ad5a8752", size = 10754069, upload-time = "2026-03-05T20:06:06.422Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/9c/d1db14469e32d98f3ca27079dbd30b7b44dbb5317d06ab36718dee3baf03/ruff-0.15.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b30da330cbd03bed0c21420b6b953158f60c74c54c5f4c1dabbdf3a57bf355d2", size = 11304315, upload-time = "2026-03-05T20:06:10.867Z" },
+    { url = "https://files.pythonhosted.org/packages/28/3a/950367aee7c69027f4f422059227b290ed780366b6aecee5de5039d50fa8/ruff-0.15.5-py3-none-win32.whl", hash = "sha256:732e5ee1f98ba5b3679029989a06ca39a950cced52143a0ea82a2102cb592b74", size = 10551676, upload-time = "2026-03-05T20:06:13.705Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/00/bf077a505b4e649bdd3c47ff8ec967735ce2544c8e4a43aba42ee9bf935d/ruff-0.15.5-py3-none-win_amd64.whl", hash = "sha256:821d41c5fa9e19117616c35eaa3f4b75046ec76c65e7ae20a333e9a8696bc7fe", size = 11678972, upload-time = "2026-03-05T20:06:45.379Z" },
+    { url = "https://files.pythonhosted.org/packages/fe/4e/cd76eca6db6115604b7626668e891c9dd03330384082e33662fb0f113614/ruff-0.15.5-py3-none-win_arm64.whl", hash = "sha256:b498d1c60d2fe5c10c45ec3f698901065772730b411f164ae270bb6bfcc4740b", size = 10965572, upload-time = "2026-03-05T20:06:16.984Z" },
 ]
 
 [[package]]
@@ -6105,14 +6092,14 @@ wheels = [
 
 [[package]]
 name = "scipy-stubs"
-version = "1.17.1.2"
+version = "1.16.3.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "optype", extra = ["numpy"] },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c7/ab/43f681ffba42f363b7ed6b767fd215d1e26006578214ff8330586a11bf95/scipy_stubs-1.17.1.2.tar.gz", hash = "sha256:2ecadc8c87a3b61aaf7379d6d6b10f1038a829c53b9efe5b174fb97fc8b52237", size = 388354, upload-time = "2026-03-15T22:33:20.449Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0b/3e/8baf960c68f012b8297930d4686b235813974833a417db8d0af798b0b93d/scipy_stubs-1.16.3.1.tar.gz", hash = "sha256:0738d55a7f8b0c94cdb8063f711d53330ebefe166f7d48dec9ffd932a337226d", size = 359990, upload-time = "2025-11-23T23:05:21.274Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8c/0b/ec4fe720c1202d9df729a3e9d9b7e4d2da9f6e7f28bd2877b7d0769f4f75/scipy_stubs-1.17.1.2-py3-none-any.whl", hash = "sha256:f19e8f5273dbe3b7ee6a9554678c3973b9695fa66b91f29206d00830a1536c06", size = 594377, upload-time = "2026-03-15T22:33:18.684Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/39/e2a69866518f88dc01940c9b9b044db97c3387f2826bd2a173e49a5c0469/scipy_stubs-1.16.3.1-py3-none-any.whl", hash = "sha256:69bc52ef6c3f8e09208abdfaf32291eb51e9ddf8fa4389401ccd9473bdd2a26d", size = 560397, upload-time = "2025-11-23T23:05:19.432Z" },
 ]
 
 [[package]]
@@ -6801,14 +6788,14 @@ wheels = [
 
 [[package]]
 name = "types-cffi"
-version = "2.0.0.20260316"
+version = "1.17.0.20250915"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "types-setuptools" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/07/4c/805b40b094eb3fd60f8d17fa7b3c58a33781311a95d0e6a74da0751ce294/types_cffi-2.0.0.20260316.tar.gz", hash = "sha256:8fb06ed4709675c999853689941133affcd2250cd6121cc11fd22c0d81ad510c", size = 17399, upload-time = "2026-03-16T07:54:43.059Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/2a/98/ea454cea03e5f351323af6a482c65924f3c26c515efd9090dede58f2b4b6/types_cffi-1.17.0.20250915.tar.gz", hash = "sha256:4362e20368f78dabd5c56bca8004752cc890e07a71605d9e0d9e069dbaac8c06", size = 17229, upload-time = "2025-09-15T03:01:25.31Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/81/5e/9f1a709225ad9d0e1d7a6e4366ff285f0113c749e882d6cbeb40eab32e75/types_cffi-2.0.0.20260316-py3-none-any.whl", hash = "sha256:dd504698029db4c580385f679324621cc64d886e6a23e9821d52bc5169251302", size = 20096, upload-time = "2026-03-16T07:54:41.994Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/ec/092f2b74b49ec4855cdb53050deb9699f7105b8fda6fe034c0781b8687f3/types_cffi-1.17.0.20250915-py3-none-any.whl", hash = "sha256:cef4af1116c83359c11bb4269283c50f0688e9fc1d7f0eeb390f3661546da52c", size = 20112, upload-time = "2025-09-15T03:01:24.187Z" },
 ]
 
 [[package]]
@@ -6840,11 +6827,11 @@ wheels = [
 
 [[package]]
 name = "types-docutils"
-version = "0.22.3.20260316"
+version = "0.22.3.20260223"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/9f/27/a7f16b3a2fad0a4ddd85a668319f9a1d0311c4bd9578894f6471c7e6c788/types_docutils-0.22.3.20260316.tar.gz", hash = "sha256:8ef27d565b9831ff094fe2eac75337a74151013e2d21ecabd445c2955f891564", size = 57263, upload-time = "2026-03-16T04:29:12.211Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/80/33/92c0129283363e3b3ba270bf6a2b7d077d949d2f90afc4abaf6e73578563/types_docutils-0.22.3.20260223.tar.gz", hash = "sha256:e90e868da82df615ea2217cf36dff31f09660daa15fc0f956af53f89c1364501", size = 57230, upload-time = "2026-02-23T04:11:21.806Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/70/60/c1f22b7cfc4837d5419e5a2d8702c7d65f03343f866364b71cccd8a73b79/types_docutils-0.22.3.20260316-py3-none-any.whl", hash = "sha256:083c7091b8072c242998ec51da1bf1492f0332387da81c3b085efbf5ca754c7d", size = 91968, upload-time = "2026-03-16T04:29:11.114Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/c7/a4ae6a75d5b07d63089d5c04d450a0de4a5d48ffcb84b95659b22d3885fe/types_docutils-0.22.3.20260223-py3-none-any.whl", hash = "sha256:cc2d6b7560a28e351903db0989091474aa619ad287843a018324baee9c4d9a8f", size = 91969, upload-time = "2026-02-23T04:11:20.966Z" },
 ]
 
 [[package]]
@@ -6874,15 +6861,15 @@ wheels = [
 
 [[package]]
 name = "types-gevent"
-version = "25.9.0.20251228"
+version = "25.9.0.20251102"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "types-greenlet" },
     { name = "types-psutil" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/06/85/c5043c4472f82c8ee3d9e0673eb4093c7d16770a26541a137a53a1d096f6/types_gevent-25.9.0.20251228.tar.gz", hash = "sha256:423ef9891d25c5a3af236c3e9aace4c444c86ff773fe13ef22731bc61d59abef", size = 38063, upload-time = "2025-12-28T03:28:28.651Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/21/552d818a475e1a31780fb7ae50308feb64211a05eb403491d1a34df95e5f/types_gevent-25.9.0.20251102.tar.gz", hash = "sha256:76f93513af63f4577bb4178c143676dd6c4780abc305f405a4e8ff8f1fa177f8", size = 38096, upload-time = "2025-11-02T03:07:42.112Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c8/b7/a2d6b652ab5a26318b68cafd58c46fafb9b15c5313d2d76a70b838febb4b/types_gevent-25.9.0.20251228-py3-none-any.whl", hash = "sha256:e2e225af4fface9241c16044983eb2fc3993f2d13d801f55c2932848649b7f2f", size = 55486, upload-time = "2025-12-28T03:28:27.382Z" },
+    { url = "https://files.pythonhosted.org/packages/60/a1/776d2de31a02123f225aaa790641113ae47f738f6e8e3091d3012240a88e/types_gevent-25.9.0.20251102-py3-none-any.whl", hash = "sha256:0f14b9977cb04bf3d94444b5ae6ec5d78ac30f74c4df83483e0facec86f19d8b", size = 55592, upload-time = "2025-11-02T03:07:41.003Z" },
 ]
 
 [[package]]
@@ -6908,11 +6895,11 @@ wheels = [
 
 [[package]]
 name = "types-jmespath"
-version = "1.1.0.20260124"
+version = "1.0.2.20250809"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/2b/ca/c8d7fc6e450c2f8fc6f510cb194754c43b17f933f2dcabcfc6985cbb97a8/types_jmespath-1.1.0.20260124.tar.gz", hash = "sha256:29d86868e72c0820914577077b27d167dcab08b1fc92157a29d537ff7153fdfe", size = 10709, upload-time = "2026-01-24T03:18:46.557Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d5/ff/6848b1603ca47fff317b44dfff78cc1fb0828262f840b3ab951b619d5a22/types_jmespath-1.0.2.20250809.tar.gz", hash = "sha256:e194efec21c0aeae789f701ae25f17c57c25908e789b1123a5c6f8d915b4adff", size = 10248, upload-time = "2025-08-09T03:14:57.996Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/61/91/915c4a6e6e9bd2bca3ec0c21c1771b175c59e204b85e57f3f572370fe753/types_jmespath-1.1.0.20260124-py3-none-any.whl", hash = "sha256:ec387666d446b15624215aa9cbd2867ffd885b6c74246d357c65e830c7a138b3", size = 11509, upload-time = "2026-01-24T03:18:45.536Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/6a/65c8be6b6555beaf1a654ae1c2308c2e19a610c0b318a9730e691b79ac79/types_jmespath-1.0.2.20250809-py3-none-any.whl", hash = "sha256:4147d17cc33454f0dac7e78b4e18e532a1330c518d85f7f6d19e5818ab83da21", size = 11494, upload-time = "2025-08-09T03:14:57.292Z" },
 ]
 
 [[package]]
@@ -6965,20 +6952,20 @@ wheels = [
 
 [[package]]
 name = "types-openpyxl"
-version = "3.1.5.20260316"
+version = "3.1.5.20250919"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a1/38/32f8ee633dd66ca6d52b8853b9fd45dc3869490195a6ed435d5c868b9c2d/types_openpyxl-3.1.5.20260316.tar.gz", hash = "sha256:081dda9427ea1141e5649e3dcf630e7013a4cf254a5862a7e0a3f53c123b7ceb", size = 101318, upload-time = "2026-03-16T04:29:05.004Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c4/12/8bc4a25d49f1e4b7bbca868daa3ee80b1983d8137b4986867b5b65ab2ecd/types_openpyxl-3.1.5.20250919.tar.gz", hash = "sha256:232b5906773eebace1509b8994cdadda043f692cfdba9bfbb86ca921d54d32d7", size = 100880, upload-time = "2025-09-19T02:54:39.997Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d5/df/b87ae6226ed7cc84b9e43119c489c7f053a9a25e209e0ebb5d84bc36fa37/types_openpyxl-3.1.5.20260316-py3-none-any.whl", hash = "sha256:38e7e125df520fb7eb72cb1129c9f024eb99ef9564aad2c27f68f080c26bcf2d", size = 166084, upload-time = "2026-03-16T04:29:03.657Z" },
+    { url = "https://files.pythonhosted.org/packages/36/3c/d49cf3f4489a10e9ddefde18fd258f120754c5825d06d145d9a0aaac770b/types_openpyxl-3.1.5.20250919-py3-none-any.whl", hash = "sha256:bd06f18b12fd5e1c9f0b666ee6151d8140216afa7496f7ebb9fe9d33a1a3ce99", size = 166078, upload-time = "2025-09-19T02:54:38.657Z" },
 ]
 
 [[package]]
 name = "types-pexpect"
-version = "4.9.0.20260127"
+version = "4.9.0.20250916"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/2e/32/7e03a07e16f79a404d6200ed6bdfcc320d0fb833436a5c6895a1403dedb7/types_pexpect-4.9.0.20260127.tar.gz", hash = "sha256:f8d43efc24251a8e533c71ea9be03d19bb5d08af096d561611697af9720cba7f", size = 13461, upload-time = "2026-01-27T03:28:30.923Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0c/e6/cc43e306dc7de14ec7861c24ac4957f688741ae39ae685049695d796b587/types_pexpect-4.9.0.20250916.tar.gz", hash = "sha256:69e5fed6199687a730a572de780a5749248a4c5df2ff1521e194563475c9928d", size = 13322, upload-time = "2025-09-16T02:49:25.61Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8a/d9/7ac5c9aa5a89a1a64cd835ae348227f4939406d826e461b85b690a8ba1c2/types_pexpect-4.9.0.20260127-py3-none-any.whl", hash = "sha256:69216c0ebf0fe45ad2900823133959b027e9471e24fc3f2e4c7b00605555da5f", size = 17078, upload-time = "2026-01-27T03:28:29.848Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/6d/7740e235a9fb2570968da7d386d7feb511ce68cd23472402ff8cdf7fc78f/types_pexpect-4.9.0.20250916-py3-none-any.whl", hash = "sha256:7fa43cb96042ac58bc74f7c28e5d85782be0ee01344149886849e9d90936fe8a", size = 17057, upload-time = "2025-09-16T02:49:24.546Z" },
 ]
 
 [[package]]
@@ -7001,11 +6988,11 @@ wheels = [
 
 [[package]]
 name = "types-psycopg2"
-version = "2.9.21.20260223"
+version = "2.9.21.20251012"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/55/1f/4daff0ce5e8e191844e65aaa793ed1b9cb40027dc2700906ecf2b6bcc0ed/types_psycopg2-2.9.21.20260223.tar.gz", hash = "sha256:78ed70de2e56bc6b5c26c8c1da8e9af54e49fdc3c94d1504609f3519e2b84f02", size = 27090, upload-time = "2026-02-23T04:11:18.177Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9b/b3/2d09eaf35a084cffd329c584970a3fa07101ca465c13cad1576d7c392587/types_psycopg2-2.9.21.20251012.tar.gz", hash = "sha256:4cdafd38927da0cfde49804f39ab85afd9c6e9c492800e42f1f0c1a1b0312935", size = 26710, upload-time = "2025-10-12T02:55:39.5Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8d/e7/c566df58410bc0728348b514e718f0b38fa0d248b5c10599a11494ba25d2/types_psycopg2-2.9.21.20260223-py3-none-any.whl", hash = "sha256:c6228ade72d813b0624f4c03feeb89471950ac27cd0506b5debed6f053086bc8", size = 24919, upload-time = "2026-02-23T04:11:17.214Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/0c/05feaf8cb51159f2c0af04b871dab7e98a2f83a3622f5f216331d2dd924c/types_psycopg2-2.9.21.20251012-py3-none-any.whl", hash = "sha256:712bad5c423fe979e357edbf40a07ca40ef775d74043de72bd4544ca328cc57e", size = 24883, upload-time = "2025-10-12T02:55:38.439Z" },
 ]
 
 [[package]]
@@ -7022,11 +7009,11 @@ wheels = [
 
 [[package]]
 name = "types-pymysql"
-version = "1.1.0.20251220"
+version = "1.1.0.20250916"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/d3/59/e959dd6d2f8e3b3c3f058d79ac9ece328922a5a8770c707fe9c3a757481c/types_pymysql-1.1.0.20251220.tar.gz", hash = "sha256:ae1c3df32a777489431e2e9963880a0df48f6591e0aa2fd3a6fabd9dee6eca54", size = 22184, upload-time = "2025-12-20T03:07:38.689Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1f/12/bda1d977c07e0e47502bede1c44a986dd45946494d89e005e04cdeb0f8de/types_pymysql-1.1.0.20250916.tar.gz", hash = "sha256:98d75731795fcc06723a192786662bdfa760e1e00f22809c104fbb47bac5e29b", size = 22131, upload-time = "2025-09-16T02:49:22.039Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/8b/fa/4f4d3bfca9ef6dd17d69ed18b96564c53b32d3ce774132308d0bee849f10/types_pymysql-1.1.0.20251220-py3-none-any.whl", hash = "sha256:fa1082af7dea6c53b6caa5784241924b1296ea3a8d3bd060417352c5e10c0618", size = 23067, upload-time = "2025-12-20T03:07:37.766Z" },
+    { url = "https://files.pythonhosted.org/packages/21/eb/a225e32a6e7b196af67ab2f1b07363595f63255374cc3b88bfdab53b4ee8/types_pymysql-1.1.0.20250916-py3-none-any.whl", hash = "sha256:873eb9836bb5e3de4368cc7010ca72775f86e9692a5c7810f8c7f48da082e55b", size = 23063, upload-time = "2025-09-16T02:49:20.933Z" },
 ]
 
 [[package]]
@@ -7044,11 +7031,11 @@ wheels = [
 
 [[package]]
 name = "types-python-dateutil"
-version = "2.9.0.20260305"
+version = "2.9.0.20251115"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/1d/c7/025c624f347e10476b439a6619a95f1d200250ea88e7ccea6e09e48a7544/types_python_dateutil-2.9.0.20260305.tar.gz", hash = "sha256:389717c9f64d8f769f36d55a01873915b37e97e52ce21928198d210fbd393c8b", size = 16885, upload-time = "2026-03-05T04:00:47.409Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6a/36/06d01fb52c0d57e9ad0c237654990920fa41195e4b3d640830dabf9eeb2f/types_python_dateutil-2.9.0.20251115.tar.gz", hash = "sha256:8a47f2c3920f52a994056b8786309b43143faa5a64d4cbb2722d6addabdf1a58", size = 16363, upload-time = "2025-11-15T03:00:13.717Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/0a/77/8c0d1ec97f0d9707ad3d8fa270ab8964e7b31b076d2f641c94987395cc75/types_python_dateutil-2.9.0.20260305-py3-none-any.whl", hash = "sha256:a3be9ca444d38cadabd756cfbb29780d8b338ae2a3020e73c266a83cc3025dd7", size = 18419, upload-time = "2026-03-05T04:00:46.392Z" },
+    { url = "https://files.pythonhosted.org/packages/43/0b/56961d3ba517ed0df9b3a27bfda6514f3d01b28d499d1bce9068cfe4edd1/types_python_dateutil-2.9.0.20251115-py3-none-any.whl", hash = "sha256:9cf9c1c582019753b8639a081deefd7e044b9fa36bd8217f565c6c4e36ee0624", size = 18251, upload-time = "2025-11-15T03:00:12.317Z" },
 ]
 
 [[package]]
@@ -7062,11 +7049,11 @@ wheels = [
 
 [[package]]
 name = "types-pywin32"
-version = "311.0.0.20260316"
+version = "311.0.0.20251008"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/17/a8/b4652002a854fcfe5d272872a0ae2d5df0e9dc482e1a6dfb5e97b905b76f/types_pywin32-311.0.0.20260316.tar.gz", hash = "sha256:c136fa489fe6279a13bca167b750414e18d657169b7cf398025856dc363004e8", size = 329956, upload-time = "2026-03-16T04:28:57.366Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1a/05/cd94300066241a7abb52238f0dd8d7f4fe1877cf2c72bd1860856604d962/types_pywin32-311.0.0.20251008.tar.gz", hash = "sha256:d6d4faf8e0d7fdc0e0a1ff297b80be07d6d18510f102d793bf54e9e3e86f6d06", size = 329561, upload-time = "2025-10-08T02:51:39.436Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f0/83/704698d93788cf1c2f5e236eae2b37f1b2152ef84dc66b4b83f6c7487b76/types_pywin32-311.0.0.20260316-py3-none-any.whl", hash = "sha256:abb643d50012386d697af49384cc0e6e475eab76b0ca2a7f93d480d0862b3692", size = 392959, upload-time = "2026-03-16T04:28:56.104Z" },
+    { url = "https://files.pythonhosted.org/packages/af/08/00a38e6b71585e6741d5b3b4cc9dd165cf549b6f1ed78815c6585f8b1b58/types_pywin32-311.0.0.20251008-py3-none-any.whl", hash = "sha256:775e1046e0bad6d29ca47501301cce67002f6661b9cebbeca93f9c388c53fab4", size = 392942, upload-time = "2025-10-08T02:51:38.327Z" },
 ]
 
 [[package]]
@@ -7123,11 +7110,11 @@ wheels = [
 
 [[package]]
 name = "types-setuptools"
-version = "82.0.0.20260210"
+version = "80.9.0.20250822"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4b/90/796ac8c774a7f535084aacbaa6b7053d16fff5c630eff87c3ecff7896c37/types_setuptools-82.0.0.20260210.tar.gz", hash = "sha256:d9719fbbeb185254480ade1f25327c4654f8c00efda3fec36823379cebcdee58", size = 44768, upload-time = "2026-02-10T04:22:02.107Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/19/bd/1e5f949b7cb740c9f0feaac430e301b8f1c5f11a81e26324299ea671a237/types_setuptools-80.9.0.20250822.tar.gz", hash = "sha256:070ea7716968ec67a84c7f7768d9952ff24d28b65b6594797a464f1b3066f965", size = 41296, upload-time = "2025-08-22T03:02:08.771Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/3e/54/3489432b1d9bc713c9d8aa810296b8f5b0088403662959fb63a8acdbd4fc/types_setuptools-82.0.0.20260210-py3-none-any.whl", hash = "sha256:5124a7daf67f195c6054e0f00f1d97c69caad12fdcf9113eba33eff0bce8cd2b", size = 68433, upload-time = "2026-02-10T04:22:00.876Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/2d/475bf15c1cdc172e7a0d665b6e373ebfb1e9bf734d3f2f543d668b07a142/types_setuptools-80.9.0.20250822-py3-none-any.whl", hash = "sha256:53bf881cb9d7e46ed12c76ef76c0aaf28cfe6211d3fab12e0b83620b1a8642c3", size = 63179, upload-time = "2025-08-22T03:02:07.643Z" },
 ]
 
 [[package]]
@@ -7162,28 +7149,28 @@ wheels = [
 
 [[package]]
 name = "types-tensorflow"
-version = "2.18.0.20260224"
+version = "2.18.0.20251008"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "types-protobuf" },
     { name = "types-requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/af/cb/4914c2fbc1cf8a8d1ef2a7c727bb6f694879be85edeee880a0c88e696af8/types_tensorflow-2.18.0.20260224.tar.gz", hash = "sha256:9b0ccc91c79c88791e43d3f80d6c879748fa0361409c5ff23c7ffe3709be00f2", size = 258786, upload-time = "2026-02-24T04:06:45.613Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0d/0a/13bde03fb5a23faaadcca2d6914f865e444334133902310ea05e6ade780c/types_tensorflow-2.18.0.20251008.tar.gz", hash = "sha256:8db03d4dd391a362e2ea796ffdbccb03c082127606d4d852edb7ed9504745933", size = 257550, upload-time = "2025-10-08T02:51:51.104Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d4/1d/a1c3c60f0eb1a204500dbdc66e3d18aafabc86ad07a8eca71ea05bc8c5a8/types_tensorflow-2.18.0.20260224-py3-none-any.whl", hash = "sha256:6a25f5f41f3e06f28c1f65c6e09f484d4ba0031d6d8df83a39df9d890245eefc", size = 329746, upload-time = "2026-02-24T04:06:44.4Z" },
+    { url = "https://files.pythonhosted.org/packages/66/cc/e50e49db621b0cf03c1f3d10be47389de41a02dc9924c3a83a9c1a55bf28/types_tensorflow-2.18.0.20251008-py3-none-any.whl", hash = "sha256:d6b0dd4d81ac6d9c5af803ebcc8ce0f65c5850c063e8b9789dc828898944b5f4", size = 329023, upload-time = "2025-10-08T02:51:50.024Z" },
 ]
 
 [[package]]
 name = "types-tqdm"
-version = "4.67.3.20260303"
+version = "4.67.0.20250809"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "types-requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e1/64/3e7cb0f40c4bf9578098b6873df33a96f7e0de90f3a039e614d22bfde40a/types_tqdm-4.67.3.20260303.tar.gz", hash = "sha256:7bfddb506a75aedb4030fabf4f05c5638c9a3bbdf900d54ec6c82be9034bfb96", size = 18117, upload-time = "2026-03-03T04:03:49.679Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/fb/d0/cf498fc630d9fdaf2428b93e60b0e67b08008fec22b78716b8323cf644dc/types_tqdm-4.67.0.20250809.tar.gz", hash = "sha256:02bf7ab91256080b9c4c63f9f11b519c27baaf52718e5fdab9e9606da168d500", size = 17200, upload-time = "2025-08-09T03:17:43.489Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/37/32/e4a1fce59155c74082f1a42d0ffafa59652bfb8cff35b04d56333877748e/types_tqdm-4.67.3.20260303-py3-none-any.whl", hash = "sha256:459decf677e4b05cef36f9012ef8d6e20578edefb6b78c15bd0b546247eda62d", size = 24572, upload-time = "2026-03-03T04:03:48.913Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/13/3ff0781445d7c12730befce0fddbbc7a76e56eb0e7029446f2853238360a/types_tqdm-4.67.0.20250809-py3-none-any.whl", hash = "sha256:1a73053b31fcabf3c1f3e2a9d5ecdba0f301bde47a418cd0e0bdf774827c5c57", size = 24020, upload-time = "2025-08-09T03:17:42.453Z" },
 ]
 
 [[package]]

docker/.env.example

@@ -1546,25 +1546,24 @@ SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL=200
 SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30
 
 
-# Redis URL used for event bus between API and
+# Redis URL used for PubSub between API and
 # celery worker
 # defaults to url constructed from `REDIS_*`
 # configurations
-EVENT_BUS_REDIS_URL=
-# Event transport type. Options are:
+PUBSUB_REDIS_URL=
+# Pub/sub channel type for streaming events.
+# valid options are:
 #
-#  - pubsub: normal Pub/Sub (at-most-once)
-#  - sharded: sharded Pub/Sub (at-most-once)
-#  - streams: Redis Streams (at-least-once, recommended to avoid subscriber races)
+# - pubsub: for normal Pub/Sub
+# - sharded: for sharded Pub/Sub
 #
-# Note: Before enabling 'streams' in production, estimate your expected event volume and retention needs.
-# Configure Redis memory limits and stream trimming appropriately (e.g., MAXLEN and key expiry) to reduce
-# the risk of data loss from Redis auto-eviction under memory pressure.
-# Also accepts ENV: EVENT_BUS_REDIS_CHANNEL_TYPE.
-EVENT_BUS_REDIS_CHANNEL_TYPE=pubsub
-# Whether to use Redis cluster mode while use redis as event bus.
+# It's highly recommended to use sharded Pub/Sub AND redis cluster
+# for large deployments.
+PUBSUB_REDIS_CHANNEL_TYPE=pubsub
+# Whether to use Redis cluster mode while running
+# PubSub.
 #  It's highly recommended to enable this for large deployments.
-EVENT_BUS_REDIS_USE_CLUSTERS=false
+PUBSUB_REDIS_USE_CLUSTERS=false
 
 # Whether to Enable human input timeout check task
 ENABLE_HUMAN_INPUT_TIMEOUT_TASK=true

docker/docker-compose-template.yaml

@@ -21,7 +21,7 @@ services:
 
   # API service
   api:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -63,7 +63,7 @@ services:
   # worker service
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -102,7 +102,7 @@ services:
   # worker_beat service
   # Celery beat for scheduling periodic tasks.
   worker_beat:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -132,7 +132,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.13.2
+    image: langgenius/dify-web:1.13.0
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -269,7 +269,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.5.4-local
+    image: langgenius/dify-plugin-daemon:0.5.3-local
     restart: always
     environment:
       # Use the shared environment variables.

docker/docker-compose.middleware.yaml

@@ -123,7 +123,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.5.4-local
+    image: langgenius/dify-plugin-daemon:0.5.3-local
     restart: always
     env_file:
       - ./middleware.env

docker/docker-compose.yaml

@@ -699,9 +699,9 @@ x-shared-env: &shared-api-worker-env
   SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE: ${SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE:-1000}
   SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL: ${SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL:-200}
   SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS: ${SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS:-30}
-  EVENT_BUS_REDIS_URL: ${EVENT_BUS_REDIS_URL:-}
-  EVENT_BUS_REDIS_CHANNEL_TYPE: ${EVENT_BUS_REDIS_CHANNEL_TYPE:-pubsub}
-  EVENT_BUS_REDIS_USE_CLUSTERS: ${EVENT_BUS_REDIS_USE_CLUSTERS:-false}
+  PUBSUB_REDIS_URL: ${PUBSUB_REDIS_URL:-}
+  PUBSUB_REDIS_CHANNEL_TYPE: ${PUBSUB_REDIS_CHANNEL_TYPE:-pubsub}
+  PUBSUB_REDIS_USE_CLUSTERS: ${PUBSUB_REDIS_USE_CLUSTERS:-false}
   ENABLE_HUMAN_INPUT_TIMEOUT_TASK: ${ENABLE_HUMAN_INPUT_TIMEOUT_TASK:-true}
   HUMAN_INPUT_TIMEOUT_TASK_INTERVAL: ${HUMAN_INPUT_TIMEOUT_TASK_INTERVAL:-1}
   SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL: ${SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL:-90000}
@@ -728,7 +728,7 @@ services:
 
   # API service
   api:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -770,7 +770,7 @@ services:
   # worker service
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -809,7 +809,7 @@ services:
   # worker_beat service
   # Celery beat for scheduling periodic tasks.
   worker_beat:
-    image: langgenius/dify-api:1.13.2
+    image: langgenius/dify-api:1.13.0
     restart: always
     environment:
       # Use the shared environment variables.
@@ -839,7 +839,7 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.13.2
+    image: langgenius/dify-web:1.13.0
     restart: always
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
@@ -976,7 +976,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.5.4-local
+    image: langgenius/dify-plugin-daemon:0.5.3-local
     restart: always
     environment:
       # Use the shared environment variables.

web/__tests__/check-components-diff-coverage.test.ts

@@ -1,221 +0,0 @@
-import {
-  buildGitDiffRevisionArgs,
-  getChangedBranchCoverage,
-  getChangedStatementCoverage,
-  getIgnoredChangedLinesFromSource,
-  normalizeToRepoRelative,
-  parseChangedLineMap,
-} from '../scripts/check-components-diff-coverage-lib.mjs'
-
-describe('check-components-diff-coverage helpers', () => {
-  it('should build exact and merge-base git diff revision args', () => {
-    expect(buildGitDiffRevisionArgs('base-sha', 'head-sha', 'exact')).toEqual(['base-sha', 'head-sha'])
-    expect(buildGitDiffRevisionArgs('base-sha', 'head-sha')).toEqual(['base-sha...head-sha'])
-  })
-
-  it('should parse changed line maps from unified diffs', () => {
-    const diff = [
-      'diff --git a/web/app/components/share/a.ts b/web/app/components/share/a.ts',
-      '+++ b/web/app/components/share/a.ts',
-      '@@ -10,0 +11,2 @@',
-      '+const a = 1',
-      '+const b = 2',
-      'diff --git a/web/app/components/base/b.ts b/web/app/components/base/b.ts',
-      '+++ b/web/app/components/base/b.ts',
-      '@@ -20 +21 @@',
-      '+const c = 3',
-      'diff --git a/web/README.md b/web/README.md',
-      '+++ b/web/README.md',
-      '@@ -1 +1 @@',
-      '+ignore me',
-    ].join('\n')
-
-    const lineMap = parseChangedLineMap(diff, (filePath: string) => filePath.startsWith('web/app/components/'))
-
-    expect([...lineMap.entries()]).toEqual([
-      ['web/app/components/share/a.ts', new Set([11, 12])],
-      ['web/app/components/base/b.ts', new Set([21])],
-    ])
-  })
-
-  it('should normalize coverage and absolute paths to repo-relative paths', () => {
-    const repoRoot = '/repo'
-    const webRoot = '/repo/web'
-
-    expect(normalizeToRepoRelative('web/app/components/share/a.ts', {
-      appComponentsCoveragePrefix: 'app/components/',
-      appComponentsPrefix: 'web/app/components/',
-      repoRoot,
-      sharedTestPrefix: 'web/__tests__/',
-      webRoot,
-    })).toBe('web/app/components/share/a.ts')
-
-    expect(normalizeToRepoRelative('app/components/share/a.ts', {
-      appComponentsCoveragePrefix: 'app/components/',
-      appComponentsPrefix: 'web/app/components/',
-      repoRoot,
-      sharedTestPrefix: 'web/__tests__/',
-      webRoot,
-    })).toBe('web/app/components/share/a.ts')
-
-    expect(normalizeToRepoRelative('/repo/web/app/components/share/a.ts', {
-      appComponentsCoveragePrefix: 'app/components/',
-      appComponentsPrefix: 'web/app/components/',
-      repoRoot,
-      sharedTestPrefix: 'web/__tests__/',
-      webRoot,
-    })).toBe('web/app/components/share/a.ts')
-  })
-
-  it('should calculate changed statement coverage from changed lines', () => {
-    const entry = {
-      s: { 0: 1, 1: 0 },
-      statementMap: {
-        0: { start: { line: 10 }, end: { line: 10 } },
-        1: { start: { line: 12 }, end: { line: 13 } },
-      },
-    }
-
-    const coverage = getChangedStatementCoverage(entry, new Set([10, 12]))
-
-    expect(coverage).toEqual({
-      covered: 1,
-      total: 2,
-      uncoveredLines: [12],
-    })
-  })
-
-  it('should report the first changed line inside a multi-line uncovered statement', () => {
-    const entry = {
-      s: { 0: 0 },
-      statementMap: {
-        0: { start: { line: 10 }, end: { line: 14 } },
-      },
-    }
-
-    const coverage = getChangedStatementCoverage(entry, new Set([13, 14]))
-
-    expect(coverage).toEqual({
-      covered: 0,
-      total: 1,
-      uncoveredLines: [13],
-    })
-  })
-
-  it('should fail changed lines when a source file has no coverage entry', () => {
-    const coverage = getChangedStatementCoverage(undefined, new Set([42, 43]))
-
-    expect(coverage).toEqual({
-      covered: 0,
-      total: 2,
-      uncoveredLines: [42, 43],
-    })
-  })
-
-  it('should calculate changed branch coverage using changed branch definitions', () => {
-    const entry = {
-      b: {
-        0: [1, 0],
-      },
-      branchMap: {
-        0: {
-          line: 20,
-          loc: { start: { line: 20 }, end: { line: 20 } },
-          locations: [
-            { start: { line: 20 }, end: { line: 20 } },
-            { start: { line: 21 }, end: { line: 21 } },
-          ],
-          type: 'if',
-        },
-      },
-    }
-
-    const coverage = getChangedBranchCoverage(entry, new Set([20]))
-
-    expect(coverage).toEqual({
-      covered: 1,
-      total: 2,
-      uncoveredBranches: [
-        { armIndex: 1, line: 21 },
-      ],
-    })
-  })
-
-  it('should report the first changed line inside a multi-line uncovered branch arm', () => {
-    const entry = {
-      b: {
-        0: [0, 0],
-      },
-      branchMap: {
-        0: {
-          line: 30,
-          loc: { start: { line: 30 }, end: { line: 35 } },
-          locations: [
-            { start: { line: 31 }, end: { line: 34 } },
-            { start: { line: 35 }, end: { line: 38 } },
-          ],
-          type: 'if',
-        },
-      },
-    }
-
-    const coverage = getChangedBranchCoverage(entry, new Set([33]))
-
-    expect(coverage).toEqual({
-      covered: 0,
-      total: 1,
-      uncoveredBranches: [
-        { armIndex: 0, line: 33 },
-      ],
-    })
-  })
-
-  it('should require all branch arms when the branch condition changes', () => {
-    const entry = {
-      b: {
-        0: [0, 0],
-      },
-      branchMap: {
-        0: {
-          line: 30,
-          loc: { start: { line: 30 }, end: { line: 35 } },
-          locations: [
-            { start: { line: 31 }, end: { line: 34 } },
-            { start: { line: 35 }, end: { line: 38 } },
-          ],
-          type: 'if',
-        },
-      },
-    }
-
-    const coverage = getChangedBranchCoverage(entry, new Set([30]))
-
-    expect(coverage).toEqual({
-      covered: 0,
-      total: 2,
-      uncoveredBranches: [
-        { armIndex: 0, line: 31 },
-        { armIndex: 1, line: 35 },
-      ],
-    })
-  })
-
-  it('should ignore changed lines with valid pragma reasons and report invalid pragmas', () => {
-    const sourceCode = [
-      'const a = 1',
-      'const b = 2 // diff-coverage-ignore-line: defensive fallback',
-      'const c = 3 // diff-coverage-ignore-line:',
-      'const d = 4 // diff-coverage-ignore-line: not changed',
-    ].join('\n')
-
-    const result = getIgnoredChangedLinesFromSource(sourceCode, new Set([2, 3]))
-
-    expect([...result.effectiveChangedLines]).toEqual([3])
-    expect([...result.ignoredLines.entries()]).toEqual([
-      [2, 'defensive fallback'],
-    ])
-    expect(result.invalidPragmas).toEqual([
-      { line: 3, reason: 'missing ignore reason' },
-    ])
-  })
-})

web/__tests__/components-coverage-common.test.ts

@@ -1,72 +0,0 @@
-import {
-  getCoverageStats,
-  isRelevantTestFile,
-  isTrackedComponentSourceFile,
-  loadTrackedCoverageEntries,
-} from '../scripts/components-coverage-common.mjs'
-
-describe('components coverage common helpers', () => {
-  it('should identify tracked component source files and relevant tests', () => {
-    const excludedComponentCoverageFiles = new Set([
-      'web/app/components/share/types.ts',
-    ])
-
-    expect(isTrackedComponentSourceFile('web/app/components/share/index.tsx', excludedComponentCoverageFiles)).toBe(true)
-    expect(isTrackedComponentSourceFile('web/app/components/share/types.ts', excludedComponentCoverageFiles)).toBe(false)
-    expect(isTrackedComponentSourceFile('web/app/components/provider/index.tsx', excludedComponentCoverageFiles)).toBe(false)
-
-    expect(isRelevantTestFile('web/__tests__/share/text-generation-run-once-flow.test.tsx')).toBe(true)
-    expect(isRelevantTestFile('web/app/components/share/__tests__/index.spec.tsx')).toBe(true)
-    expect(isRelevantTestFile('web/utils/format.spec.ts')).toBe(false)
-  })
-
-  it('should load only tracked coverage entries from mixed coverage paths', () => {
-    const context = {
-      excludedComponentCoverageFiles: new Set([
-        'web/app/components/share/types.ts',
-      ]),
-      repoRoot: '/repo',
-      webRoot: '/repo/web',
-    }
-    const coverage = {
-      '/repo/web/app/components/provider/index.tsx': {
-        path: '/repo/web/app/components/provider/index.tsx',
-        statementMap: { 0: { start: { line: 1 }, end: { line: 1 } } },
-        s: { 0: 1 },
-      },
-      'app/components/share/index.tsx': {
-        path: 'app/components/share/index.tsx',
-        statementMap: { 0: { start: { line: 2 }, end: { line: 2 } } },
-        s: { 0: 1 },
-      },
-      'app/components/share/types.ts': {
-        path: 'app/components/share/types.ts',
-        statementMap: { 0: { start: { line: 3 }, end: { line: 3 } } },
-        s: { 0: 1 },
-      },
-    }
-
-    expect([...loadTrackedCoverageEntries(coverage, context).keys()]).toEqual([
-      'web/app/components/share/index.tsx',
-    ])
-  })
-
-  it('should calculate coverage stats using statement-derived line hits', () => {
-    const entry = {
-      b: { 0: [1, 0] },
-      f: { 0: 1, 1: 0 },
-      s: { 0: 1, 1: 0 },
-      statementMap: {
-        0: { start: { line: 10 }, end: { line: 10 } },
-        1: { start: { line: 12 }, end: { line: 13 } },
-      },
-    }
-
-    expect(getCoverageStats(entry)).toEqual({
-      branches: { covered: 1, total: 2 },
-      functions: { covered: 1, total: 2 },
-      lines: { covered: 1, total: 2 },
-      statements: { covered: 1, total: 2 },
-    })
-  })
-})

web/app/components/app/configuration/config-vision/index.spec.tsx

@@ -218,7 +218,7 @@ describe('ParamConfigContent', () => {
     })
 
     render(<ParamConfigContent />)
-    const input = screen.getByRole('textbox') as HTMLInputElement
+    const input = screen.getByRole('spinbutton') as HTMLInputElement
     fireEvent.change(input, { target: { value: '4' } })
 
     const updatedFile = getLatestFileConfig()

web/app/components/app/configuration/dataset-config/params-config/index.spec.tsx

@@ -184,8 +184,8 @@ describe('dataset-config/params-config', () => {
       await user.click(incrementButtons[0])
 
       await waitFor(() => {
-        const [topKInput] = dialogScope.getAllByRole('textbox')
-        expect(topKInput).toHaveValue('5')
+        const [topKInput] = dialogScope.getAllByRole('spinbutton')
+        expect(topKInput).toHaveValue(5)
       })
 
       await user.click(dialogScope.getByRole('button', { name: 'common.operation.save' }))
@@ -197,10 +197,10 @@ describe('dataset-config/params-config', () => {
       await user.click(screen.getByRole('button', { name: 'dataset.retrievalSettings' }))
       const reopenedDialog = await screen.findByRole('dialog', {}, { timeout: 3000 })
       const reopenedScope = within(reopenedDialog)
-      const [reopenedTopKInput] = reopenedScope.getAllByRole('textbox')
+      const [reopenedTopKInput] = reopenedScope.getAllByRole('spinbutton')
 
       // Assert
-      expect(reopenedTopKInput).toHaveValue('5')
+      expect(reopenedTopKInput).toHaveValue(5)
     })
 
     it('should discard changes when cancel is clicked', async () => {
@@ -217,8 +217,8 @@ describe('dataset-config/params-config', () => {
       await user.click(incrementButtons[0])
 
       await waitFor(() => {
-        const [topKInput] = dialogScope.getAllByRole('textbox')
-        expect(topKInput).toHaveValue('5')
+        const [topKInput] = dialogScope.getAllByRole('spinbutton')
+        expect(topKInput).toHaveValue(5)
       })
 
       const cancelButton = await dialogScope.findByRole('button', { name: 'common.operation.cancel' })
@@ -231,10 +231,10 @@ describe('dataset-config/params-config', () => {
       await user.click(screen.getByRole('button', { name: 'dataset.retrievalSettings' }))
       const reopenedDialog = await screen.findByRole('dialog', {}, { timeout: 3000 })
       const reopenedScope = within(reopenedDialog)
-      const [reopenedTopKInput] = reopenedScope.getAllByRole('textbox')
+      const [reopenedTopKInput] = reopenedScope.getAllByRole('spinbutton')
 
       // Assert
-      expect(reopenedTopKInput).toHaveValue('4')
+      expect(reopenedTopKInput).toHaveValue(4)
     })
 
     it('should prevent saving when rerank model is required but invalid', async () => {

web/app/components/app/configuration/dataset-config/select-dataset/index.spec.tsx

@@ -137,31 +137,4 @@ describe('SelectDataSet', () => {
     expect(screen.getByRole('link', { name: 'appDebug.feature.dataSet.toCreate' })).toHaveAttribute('href', '/datasets/create')
     expect(screen.getByRole('button', { name: 'common.operation.add' })).toBeDisabled()
   })
-
-  it('uses selectedIds as the initial modal selection', async () => {
-    const datasetOne = makeDataset({
-      id: 'set-1',
-      name: 'Dataset One',
-    })
-    mockUseInfiniteDatasets.mockReturnValue({
-      data: { pages: [{ data: [datasetOne] }] },
-      isLoading: false,
-      isFetchingNextPage: false,
-      fetchNextPage: vi.fn(),
-      hasNextPage: false,
-    })
-
-    const onSelect = vi.fn()
-    await act(async () => {
-      render(<SelectDataSet {...baseProps} onSelect={onSelect} selectedIds={['set-1']} />)
-    })
-
-    expect(screen.getByText('1 appDebug.feature.dataSet.selected')).toBeInTheDocument()
-
-    await act(async () => {
-      fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
-    })
-
-    expect(onSelect).toHaveBeenCalledWith([datasetOne])
-  })
 })

web/app/components/app/configuration/dataset-config/select-dataset/index.tsx

@@ -4,7 +4,7 @@ import type { DataSet } from '@/models/datasets'
 import { useInfiniteScroll } from 'ahooks'
 import Link from 'next/link'
 import * as React from 'react'
-import { useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import Badge from '@/app/components/base/badge'
@@ -31,21 +31,17 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
   onSelect,
 }) => {
   const { t } = useTranslation()
-  const [selectedIdsInModal, setSelectedIdsInModal] = useState(() => selectedIds)
+  const [selected, setSelected] = useState<DataSet[]>([])
   const canSelectMulti = true
   const { formatIndexingTechniqueAndMethod } = useKnowledge()
   const { data, isLoading, isFetchingNextPage, fetchNextPage, hasNextPage } = useInfiniteDatasets(
     { page: 1 },
     { enabled: isShow, staleTime: 0, refetchOnMount: 'always' },
   )
+  const pages = data?.pages || []
   const datasets = useMemo(() => {
-    const pages = data?.pages || []
     return pages.flatMap(page => page.data.filter(item => item.indexing_technique || item.provider === 'external'))
-  }, [data])
-  const datasetMap = useMemo(() => new Map(datasets.map(item => [item.id, item])), [datasets])
-  const selected = useMemo(() => {
-    return selectedIdsInModal.map(id => datasetMap.get(id) || ({ id } as DataSet))
-  }, [datasetMap, selectedIdsInModal])
+  }, [pages])
   const hasNoData = !isLoading && datasets.length === 0
 
   const listRef = useRef<HTMLDivElement>(null)
@@ -65,14 +61,50 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
     },
   )
 
-  const toggleSelect = (dataSet: DataSet) => {
-    setSelectedIdsInModal((prev) => {
-      const isSelected = prev.includes(dataSet.id)
-      if (isSelected)
-        return prev.filter(id => id !== dataSet.id)
+  const prevSelectedIdsRef = useRef<string[]>([])
+  const hasUserModifiedSelectionRef = useRef(false)
+  useEffect(() => {
+    if (isShow)
+      hasUserModifiedSelectionRef.current = false
+  }, [isShow])
+  useEffect(() => {
+    const prevSelectedIds = prevSelectedIdsRef.current
+    const idsChanged = selectedIds.length !== prevSelectedIds.length
+      || selectedIds.some((id, idx) => id !== prevSelectedIds[idx])
 
-      return canSelectMulti ? [...prev, dataSet.id] : [dataSet.id]
+    if (!selectedIds.length && (!hasUserModifiedSelectionRef.current || idsChanged)) {
+      setSelected([])
+      prevSelectedIdsRef.current = selectedIds
+      hasUserModifiedSelectionRef.current = false
+      return
+    }
+
+    if (!idsChanged && hasUserModifiedSelectionRef.current)
+      return
+
+    setSelected((prev) => {
+      const prevMap = new Map(prev.map(item => [item.id, item]))
+      const nextSelected = selectedIds
+        .map(id => datasets.find(item => item.id === id) || prevMap.get(id))
+        .filter(Boolean) as DataSet[]
+      return nextSelected
     })
+    prevSelectedIdsRef.current = selectedIds
+    hasUserModifiedSelectionRef.current = false
+  }, [datasets, selectedIds])
+
+  const toggleSelect = (dataSet: DataSet) => {
+    hasUserModifiedSelectionRef.current = true
+    const isSelected = selected.some(item => item.id === dataSet.id)
+    if (isSelected) {
+      setSelected(selected.filter(item => item.id !== dataSet.id))
+    }
+    else {
+      if (canSelectMulti)
+        setSelected([...selected, dataSet])
+      else
+        setSelected([dataSet])
+    }
   }
 
   const handleSelect = () => {
@@ -94,7 +126,7 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
 
       {hasNoData && (
         <div
-          className="mt-6 flex h-[128px] items-center justify-center space-x-1 rounded-lg border text-[13px]"
+          className="mt-6 flex h-[128px] items-center justify-center space-x-1  rounded-lg border text-[13px]"
           style={{
             background: 'rgba(0, 0, 0, 0.02)',
             borderColor: 'rgba(0, 0, 0, 0.02',
@@ -113,7 +145,7 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
                 key={item.id}
                 className={cn(
                   'flex h-10 cursor-pointer items-center rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg px-2 shadow-xs hover:border-components-panel-border hover:bg-components-panel-on-panel-item-bg-hover hover:shadow-sm',
-                  selectedIdsInModal.includes(item.id) && 'border-[1.5px] border-components-option-card-option-selected-border bg-state-accent-hover shadow-xs hover:border-components-option-card-option-selected-border hover:bg-state-accent-hover hover:shadow-xs',
+                  selected.some(i => i.id === item.id) && 'border-[1.5px] border-components-option-card-option-selected-border bg-state-accent-hover shadow-xs hover:border-components-option-card-option-selected-border hover:bg-state-accent-hover hover:shadow-xs',
                   !item.embedding_available && 'hover:border-components-panel-border-subtle hover:bg-components-panel-on-panel-item-bg hover:shadow-xs',
                 )}
                 onClick={() => {
@@ -163,7 +195,7 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
       )}
       {!isLoading && (
         <div className="mt-8 flex items-center justify-between">
-          <div className="text-sm font-medium text-text-secondary">
+          <div className="text-sm  font-medium text-text-secondary">
             {selected.length > 0 && `${selected.length} ${t('feature.dataSet.selected', { ns: 'appDebug' })}`}
           </div>
           <div className="flex space-x-2">

web/app/components/app/create-app-modal/index.tsx

@@ -4,6 +4,7 @@ import type { AppIconSelection } from '../../base/app-icon-picker'
 import { RiArrowRightLine, RiArrowRightSLine, RiExchange2Fill } from '@remixicon/react'
 
 import { useDebounceFn, useKeyPress } from 'ahooks'
+import Image from 'next/image'
 import { useRouter } from 'next/navigation'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -116,10 +117,10 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
           <div className="px-10">
             <div className="h-6 w-full 2xl:h-[139px]" />
             <div className="pb-6 pt-1">
-              <span className="text-text-primary title-2xl-semi-bold">{t('newApp.startFromBlank', { ns: 'app' })}</span>
+              <span className="title-2xl-semi-bold text-text-primary">{t('newApp.startFromBlank', { ns: 'app' })}</span>
             </div>
             <div className="mb-2 leading-6">
-              <span className="text-text-secondary system-sm-semibold">{t('newApp.chooseAppType', { ns: 'app' })}</span>
+              <span className="system-sm-semibold text-text-secondary">{t('newApp.chooseAppType', { ns: 'app' })}</span>
             </div>
             <div className="flex w-[660px] flex-col gap-4">
               <div>
@@ -159,7 +160,7 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
                     className="flex cursor-pointer items-center border-0 bg-transparent p-0"
                     onClick={() => setIsAppTypeExpanded(!isAppTypeExpanded)}
                   >
-                    <span className="text-text-tertiary system-2xs-medium-uppercase">{t('newApp.forBeginners', { ns: 'app' })}</span>
+                    <span className="system-2xs-medium-uppercase text-text-tertiary">{t('newApp.forBeginners', { ns: 'app' })}</span>
                     <RiArrowRightSLine className={`ml-1 h-4 w-4 text-text-tertiary transition-transform ${isAppTypeExpanded ? 'rotate-90' : ''}`} />
                   </button>
                 </div>
@@ -211,7 +212,7 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
               <div className="flex items-center space-x-3">
                 <div className="flex-1">
                   <div className="mb-1 flex h-6 items-center">
-                    <label className="text-text-secondary system-sm-semibold">{t('newApp.captionName', { ns: 'app' })}</label>
+                    <label className="system-sm-semibold text-text-secondary">{t('newApp.captionName', { ns: 'app' })}</label>
                   </div>
                   <Input
                     value={name}
@@ -242,8 +243,8 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
               </div>
               <div>
                 <div className="mb-1 flex h-6 items-center">
-                  <label className="text-text-secondary system-sm-semibold">{t('newApp.captionDescription', { ns: 'app' })}</label>
-                  <span className="ml-1 text-text-tertiary system-xs-regular">
+                  <label className="system-sm-semibold text-text-secondary">{t('newApp.captionDescription', { ns: 'app' })}</label>
+                  <span className="system-xs-regular ml-1 text-text-tertiary">
                     (
                     {t('newApp.optional', { ns: 'app' })}
                     )
@@ -259,7 +260,7 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
             </div>
             {isAppsFull && <AppsFull className="mt-4" loc="app-create" />}
             <div className="flex items-center justify-between pb-10 pt-5">
-              <div className="flex cursor-pointer items-center gap-1 text-text-tertiary system-xs-regular" onClick={onCreateFromTemplate}>
+              <div className="system-xs-regular flex cursor-pointer items-center gap-1 text-text-tertiary" onClick={onCreateFromTemplate}>
                 <span>{t('newApp.noIdeaTip', { ns: 'app' })}</span>
                 <div className="p-[1px]">
                   <RiArrowRightLine className="h-3.5 w-3.5" />
@@ -333,8 +334,8 @@ function AppTypeCard({ icon, title, description, active, onClick }: AppTypeCardP
       onClick={onClick}
     >
       {icon}
-      <div className="mb-0.5 mt-2 text-text-secondary system-sm-semibold">{title}</div>
-      <div className="line-clamp-2 text-text-tertiary system-xs-regular" title={description}>{description}</div>
+      <div className="system-sm-semibold mb-0.5 mt-2 text-text-secondary">{title}</div>
+      <div className="system-xs-regular line-clamp-2 text-text-tertiary" title={description}>{description}</div>
     </div>
   )
 }
@@ -366,8 +367,8 @@ function AppPreview({ mode }: { mode: AppModeEnum }) {
   const previewInfo = modeToPreviewInfoMap[mode]
   return (
     <div className="px-8 py-4">
-      <h4 className="text-text-secondary system-sm-semibold-uppercase">{previewInfo.title}</h4>
-      <div className="mt-1 min-h-8 max-w-96 text-text-tertiary system-xs-regular">
+      <h4 className="system-sm-semibold-uppercase text-text-secondary">{previewInfo.title}</h4>
+      <div className="system-xs-regular mt-1 min-h-8 max-w-96 text-text-tertiary">
         <span>{previewInfo.description}</span>
       </div>
     </div>
@@ -388,7 +389,7 @@ function AppScreenShot({ mode, show }: { mode: AppModeEnum, show: boolean }) {
       <source media="(resolution: 1x)" srcSet={`${basePath}/screenshots/${theme}/${modeToImageMap[mode]}.png`} />
       <source media="(resolution: 2x)" srcSet={`${basePath}/screenshots/${theme}/${modeToImageMap[mode]}@2x.png`} />
       <source media="(resolution: 3x)" srcSet={`${basePath}/screenshots/${theme}/${modeToImageMap[mode]}@3x.png`} />
-      <img
+      <Image
         className={show ? '' : 'hidden'}
         src={`${basePath}/screenshots/${theme}/${modeToImageMap[mode]}.png`}
         alt="App Screen Shot"

web/app/components/base/chat/embedded-chatbot/header/__tests__/index.spec.tsx

@@ -1,3 +1,5 @@
+/* eslint-disable next/no-img-element */
+import type { ImgHTMLAttributes } from 'react'
 import type { EmbeddedChatbotContextValue } from '../../context'
 import type { AppData } from '@/models/share'
 import type { SystemFeatures } from '@/types/feature'
@@ -20,6 +22,15 @@ vi.mock('@/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropd
   default: () => <div data-testid="view-form-dropdown" />,
 }))
 
+// Mock next/image to render a normal img tag for testing
+vi.mock('next/image', () => ({
+  __esModule: true,
+  default: (props: ImgHTMLAttributes<HTMLImageElement> & { unoptimized?: boolean }) => {
+    const { unoptimized: _, ...rest } = props
+    return <img {...rest} />
+  },
+}))
+
 type GlobalPublicStoreMock = {
   systemFeatures: SystemFeatures
   setSystemFeatures: (systemFeatures: SystemFeatures) => void

web/app/components/base/checkbox-list/__tests__/index.spec.tsx

@@ -1,7 +1,13 @@
+/* eslint-disable next/no-img-element */
+import type { ImgHTMLAttributes } from 'react'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import CheckboxList from '..'
 
+vi.mock('next/image', () => ({
+  default: (props: ImgHTMLAttributes<HTMLImageElement>) => <img {...props} />,
+}))
+
 describe('checkbox list component', () => {
   const options = [
     { label: 'Option 1', value: 'option1' },

web/app/components/base/checkbox-list/index.tsx

@@ -1,5 +1,6 @@
 'use client'
 import type { FC } from 'react'
+import Image from 'next/image'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
@@ -168,7 +169,7 @@ const CheckboxList: FC<CheckboxListProps> = ({
                   {searchQuery
                     ? (
                         <div className="flex flex-col items-center justify-center gap-2">
-                          <img alt="search menu" src={SearchMenu.src} width={32} />
+                          <Image alt="search menu" src={SearchMenu} width={32} />
                           <span className="text-text-secondary system-sm-regular">{t('operation.noSearchResults', { ns: 'common', content: title })}</span>
                           <Button variant="secondary-accent" size="small" onClick={() => setSearchQuery('')}>{t('operation.resetKeywords', { ns: 'common' })}</Button>
                         </div>

web/app/components/base/file-thumb/__tests__/index.spec.tsx

@@ -1,7 +1,14 @@
+/* eslint-disable next/no-img-element */
+import type { ImgHTMLAttributes } from 'react'
 import { fireEvent, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import FileThumb from '../index'
 
+vi.mock('next/image', () => ({
+  __esModule: true,
+  default: (props: ImgHTMLAttributes<HTMLImageElement>) => <img {...props} />,
+}))
+
 describe('FileThumb Component', () => {
   const mockImageFile = {
     name: 'test-image.jpg',

web/app/components/base/form/components/field/__tests__/number-input.spec.tsx

@@ -22,7 +22,7 @@ describe('NumberInputField', () => {
 
   it('should render current number value', () => {
     render(<NumberInputField label="Count" />)
-    expect(screen.getByRole('textbox')).toHaveValue('2')
+    expect(screen.getByDisplayValue('2')).toBeInTheDocument()
   })
 
   it('should update value when users click increment', () => {

web/app/components/base/form/form-scenarios/base/__tests__/field.spec.tsx

@@ -45,7 +45,7 @@ describe('BaseField', () => {
   it('should render a number input when configured as number input', () => {
     render(<FieldHarness config={createConfig({ type: BaseFieldType.numberInput, label: 'Age' })} initialData={{ fieldA: 20 }} />)
 
-    expect(screen.getByRole('textbox')).toBeInTheDocument()
+    expect(screen.getByRole('spinbutton')).toBeInTheDocument()
     expect(screen.getByText('Age')).toBeInTheDocument()
   })
 

web/app/components/base/input-number/__tests__/index.spec.tsx

@@ -13,7 +13,7 @@ describe('InputNumber Component', () => {
 
   it('renders input with default values', () => {
     render(<InputNumber {...defaultProps} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
     expect(input).toBeInTheDocument()
   })
 
@@ -60,7 +60,7 @@ describe('InputNumber Component', () => {
   it('handles direct input changes', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '42' } })
     expect(onChange).toHaveBeenCalledWith(42)
@@ -69,25 +69,38 @@ describe('InputNumber Component', () => {
   it('handles empty input', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} value={1} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '' } })
     expect(onChange).toHaveBeenCalledWith(0)
   })
 
-  it('does not call onChange when input is not parseable', () => {
+  it('does not call onChange when parsed value is NaN', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
-    fireEvent.change(input, { target: { value: 'abc' } })
-    expect(onChange).not.toHaveBeenCalled()
+    const originalNumber = globalThis.Number
+    const numberSpy = vi.spyOn(globalThis, 'Number').mockImplementation((val: unknown) => {
+      if (val === '123') {
+        return Number.NaN
+      }
+      return originalNumber(val)
+    })
+
+    try {
+      fireEvent.change(input, { target: { value: '123' } })
+      expect(onChange).not.toHaveBeenCalled()
+    }
+    finally {
+      numberSpy.mockRestore()
+    }
   })
 
   it('does not call onChange when direct input exceeds range', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} max={10} min={0} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '11' } })
 
@@ -128,7 +141,7 @@ describe('InputNumber Component', () => {
   it('disables controls when disabled prop is true', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} disabled />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
     const incrementBtn = screen.getByRole('button', { name: /increment/i })
     const decrementBtn = screen.getByRole('button', { name: /decrement/i })
 
@@ -198,16 +211,6 @@ describe('InputNumber Component', () => {
     expect(onChange).not.toHaveBeenCalled()
   })
 
-  it('uses fallback step guard when step is any', async () => {
-    const user = userEvent.setup()
-    const onChange = vi.fn()
-    render(<InputNumber onChange={onChange} value={10} max={10} step="any" />)
-    const incrementBtn = screen.getByRole('button', { name: /increment/i })
-
-    await user.click(incrementBtn)
-    expect(onChange).not.toHaveBeenCalled()
-  })
-
   it('prevents decrement below min with custom amount', async () => {
     const user = userEvent.setup()
     const onChange = vi.fn()
@@ -241,7 +244,7 @@ describe('InputNumber Component', () => {
   it('validates input against max constraint', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} max={10} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '15' } })
     expect(onChange).not.toHaveBeenCalled()
@@ -250,7 +253,7 @@ describe('InputNumber Component', () => {
   it('validates input against min constraint', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} min={5} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '2' } })
     expect(onChange).not.toHaveBeenCalled()
@@ -259,7 +262,7 @@ describe('InputNumber Component', () => {
   it('accepts input within min and max constraints', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} min={0} max={100} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '50' } })
     expect(onChange).toHaveBeenCalledWith(50)
@@ -293,25 +296,6 @@ describe('InputNumber Component', () => {
     expect(wrapper).toHaveClass(wrapClassName)
   })
 
-  it('applies wrapperClassName to outer div for Input compatibility', () => {
-    const onChange = vi.fn()
-    const wrapperClassName = 'custom-input-wrapper'
-    render(<InputNumber onChange={onChange} wrapperClassName={wrapperClassName} />)
-
-    const input = screen.getByRole('textbox')
-    const wrapper = screen.getByTestId('input-number-wrapper')
-
-    expect(input).not.toHaveAttribute('wrapperClassName')
-    expect(wrapper).toHaveClass(wrapperClassName)
-  })
-
-  it('applies styleCss to the input element', () => {
-    const onChange = vi.fn()
-    render(<InputNumber onChange={onChange} styleCss={{ color: 'red' }} />)
-
-    expect(screen.getByRole('textbox')).toHaveStyle({ color: 'rgb(255, 0, 0)' })
-  })
-
   it('applies controlWrapClassName to control buttons container', () => {
     const onChange = vi.fn()
     const controlWrapClassName = 'custom-control-wrap'
@@ -343,7 +327,7 @@ describe('InputNumber Component', () => {
   it('handles zero as a valid input', () => {
     const onChange = vi.fn()
     render(<InputNumber onChange={onChange} min={-5} max={5} value={1} />)
-    const input = screen.getByRole('textbox')
+    const input = screen.getByRole('spinbutton')
 
     fireEvent.change(input, { target: { value: '0' } })
     expect(onChange).toHaveBeenCalledWith(0)

web/app/components/base/input-number/index.tsx

@@ -1,23 +1,10 @@
-import type { NumberFieldRoot as BaseNumberFieldRoot } from '@base-ui/react/number-field'
-import type { CSSProperties, FC, InputHTMLAttributes } from 'react'
+import type { FC } from 'react'
+import type { InputProps } from '../input'
 import { useCallback } from 'react'
-import {
-  NumberField,
-  NumberFieldControls,
-  NumberFieldDecrement,
-  NumberFieldGroup,
-  NumberFieldIncrement,
-  NumberFieldInput,
-  NumberFieldUnit,
-} from '@/app/components/base/ui/number-field'
 import { cn } from '@/utils/classnames'
+import Input from '../input'
 
-type InputNumberInputProps = Omit<
-  InputHTMLAttributes<HTMLInputElement>,
-  'defaultValue' | 'max' | 'min' | 'onChange' | 'size' | 'type' | 'value'
->
-
-export type InputNumberProps = InputNumberInputProps & {
+export type InputNumberProps = {
   unit?: string
   value?: number
   onChange: (value: number) => void
@@ -25,69 +12,19 @@ export type InputNumberProps = InputNumberInputProps & {
   size?: 'regular' | 'large'
   max?: number
   min?: number
-  step?: number | 'any'
   defaultValue?: number
   disabled?: boolean
   wrapClassName?: string
-  wrapperClassName?: string
-  styleCss?: CSSProperties
   controlWrapClassName?: string
   controlClassName?: string
-  type?: 'number'
-}
-
-const STEPPER_REASONS = new Set<BaseNumberFieldRoot.ChangeEventDetails['reason']>([
-  'increment-press',
-  'decrement-press',
-])
-
-const isValueWithinBounds = (value: number, min?: number, max?: number) => {
-  if (typeof min === 'number' && value < min)
-    return false
-
-  if (typeof max === 'number' && value > max)
-    return false
-
-  return true
-}
-
-const resolveStep = (amount?: number, step?: InputNumberProps['step']) => (
-  amount ?? (step === 'any' || typeof step === 'number' ? step : undefined) ?? 1
-)
-
-const exceedsStepBounds = ({
-  value,
-  reason,
-  stepAmount,
-  min,
-  max,
-}: {
-  value?: number
-  reason: BaseNumberFieldRoot.ChangeEventDetails['reason']
-  stepAmount: number
-  min?: number
-  max?: number
-}) => {
-  if (typeof value !== 'number')
-    return false
-
-  if (reason === 'increment-press' && typeof max === 'number')
-    return value + stepAmount > max
-
-  if (reason === 'decrement-press' && typeof min === 'number')
-    return value - stepAmount < min
-
-  return false
-}
+} & Omit<InputProps, 'value' | 'onChange' | 'size' | 'min' | 'max' | 'defaultValue'>
 
 export const InputNumber: FC<InputNumberProps> = (props) => {
   const {
     unit,
     className,
-    wrapperClassName,
-    styleCss,
     onChange,
-    amount,
+    amount = 1,
     value,
     size = 'regular',
     max,
@@ -97,97 +34,96 @@ export const InputNumber: FC<InputNumberProps> = (props) => {
     controlWrapClassName,
     controlClassName,
     disabled,
-    step,
-    id,
-    name,
-    readOnly,
-    required,
-    type: _type,
     ...rest
   } = props
 
-  const resolvedStep = resolveStep(amount, step)
-  const stepAmount = typeof resolvedStep === 'number' ? resolvedStep : 1
+  const isValidValue = useCallback((v: number) => {
+    if (typeof max === 'number' && v > max)
+      return false
+    return !(typeof min === 'number' && v < min)
+  }, [max, min])
 
-  const handleValueChange = useCallback((
-    nextValue: number | null,
-    eventDetails: BaseNumberFieldRoot.ChangeEventDetails,
-  ) => {
-    if (value === undefined && STEPPER_REASONS.has(eventDetails.reason)) {
+  const inc = () => {
+    /* v8 ignore next 2 - @preserve */
+    if (disabled)
+      return
+
+    if (value === undefined) {
       onChange(defaultValue ?? 0)
       return
     }
+    const newValue = value + amount
+    if (!isValidValue(newValue))
+      return
+    onChange(newValue)
+  }
+  const dec = () => {
+    /* v8 ignore next 2 - @preserve */
+    if (disabled)
+      return
 
-    if (nextValue === null) {
+    if (value === undefined) {
+      onChange(defaultValue ?? 0)
+      return
+    }
+    const newValue = value - amount
+    if (!isValidValue(newValue))
+      return
+    onChange(newValue)
+  }
+
+  const handleInputChange = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+    if (e.target.value === '') {
       onChange(0)
       return
     }
-
-    if (exceedsStepBounds({
-      value,
-      reason: eventDetails.reason,
-      stepAmount,
-      min,
-      max,
-    })) {
-      return
-    }
-
-    if (!isValueWithinBounds(nextValue, min, max))
+    const parsed = Number(e.target.value)
+    if (Number.isNaN(parsed))
       return
 
-    onChange(nextValue)
-  }, [defaultValue, max, min, onChange, stepAmount, value])
+    if (!isValidValue(parsed))
+      return
+    onChange(parsed)
+  }, [isValidValue, onChange])
 
   return (
-    <div data-testid="input-number-wrapper" className={cn('flex w-full min-w-0', wrapClassName, wrapperClassName)}>
-      <NumberField
-        className="min-w-0 grow"
-        value={value ?? null}
-        min={min}
+    <div data-testid="input-number-wrapper" className={cn('flex', wrapClassName)}>
+      <Input
+        {...rest}
+        // disable default controller
+        type="number"
+        className={cn('rounded-r-none no-spinner', className)}
+        value={value ?? 0}
         max={max}
-        step={resolvedStep}
+        min={min}
         disabled={disabled}
-        readOnly={readOnly}
-        required={required}
-        id={id}
-        name={name}
-        allowOutOfRange
-        onValueChange={handleValueChange}
+        onChange={handleInputChange}
+        unit={unit}
+        size={size}
+      />
+      <div
+        data-testid="input-number-controls"
+        className={cn('flex flex-col rounded-r-md border-l border-divider-subtle bg-components-input-bg-normal text-text-tertiary focus:shadow-xs', disabled && 'cursor-not-allowed opacity-50', controlWrapClassName)}
       >
-        <NumberFieldGroup size={size}>
-          <NumberFieldInput
-            {...rest}
-            size={size}
-            style={styleCss}
-            className={className}
-          />
-          {unit && (
-            <NumberFieldUnit size={size}>
-              {unit}
-            </NumberFieldUnit>
-          )}
-          <NumberFieldControls
-            data-testid="input-number-controls"
-            className={controlWrapClassName}
-          >
-            <NumberFieldIncrement
-              aria-label="increment"
-              size={size}
-              className={controlClassName}
-            >
-              <span aria-hidden="true" className="i-ri-arrow-up-s-line size-3" />
-            </NumberFieldIncrement>
-            <NumberFieldDecrement
-              aria-label="decrement"
-              size={size}
-              className={controlClassName}
-            >
-              <span aria-hidden="true" className="i-ri-arrow-down-s-line size-3" />
-            </NumberFieldDecrement>
-          </NumberFieldControls>
-        </NumberFieldGroup>
-      </NumberField>
+        <button
+          type="button"
+          onClick={inc}
+          disabled={disabled}
+          aria-label="increment"
+          className={cn(size === 'regular' ? 'pt-1' : 'pt-1.5', 'px-1.5 hover:bg-components-input-bg-hover', disabled && 'cursor-not-allowed hover:bg-transparent', controlClassName)}
+        >
+          <span className="i-ri-arrow-up-s-line size-3" />
+        </button>
+        <button
+          type="button"
+          onClick={dec}
+          disabled={disabled}
+          aria-label="decrement"
+          className={cn(size === 'regular' ? 'pb-1' : 'pb-1.5', 'px-1.5 hover:bg-components-input-bg-hover', disabled && 'cursor-not-allowed hover:bg-transparent', controlClassName)}
+        >
+          <span className="i-ri-arrow-down-s-line size-3" />
+        </button>
+      </div>
     </div>
   )
 }

web/app/components/base/markdown-with-directive/components/with-icon-card-item.spec.tsx

@@ -1,6 +1,10 @@
 import { render, screen } from '@testing-library/react'
 import WithIconCardItem from './with-icon-card-item'
 
+vi.mock('next/image', () => ({
+  default: ({ unoptimized: _unoptimized, ...props }: React.ImgHTMLAttributes<HTMLImageElement> & { unoptimized?: boolean }) => <img {...props} />,
+}))
+
 describe('WithIconCardItem', () => {
   beforeEach(() => {
     vi.clearAllMocks()

web/app/components/base/markdown-with-directive/components/with-icon-card-item.tsx

@@ -1,5 +1,6 @@
 import type { ReactNode } from 'react'
 import type { WithIconCardItemProps } from './markdown-with-directive-schema'
+import Image from 'next/image'
 import { cn } from '@/utils/classnames'
 
 type WithIconItemProps = WithIconCardItemProps & {
@@ -10,13 +11,18 @@ type WithIconItemProps = WithIconCardItemProps & {
 function WithIconCardItem({ icon, children, className, iconAlt }: WithIconItemProps) {
   return (
     <div className={cn('flex h-11 items-center space-x-3 rounded-lg bg-background-section px-2', className)}>
-      <img
+      {/*
+        * unoptimized to "url parameter is not allowed" for external domains despite correct remotePatterns configuration.
+        * https://github.com/vercel/next.js/issues/88873
+      */}
+      <Image
         src={icon}
         className="!border-none object-contain"
         alt={iconAlt ?? ''}
         aria-hidden={iconAlt ? undefined : true}
         width={40}
         height={40}
+        unoptimized
       />
       <div className="min-w-0 grow overflow-hidden text-text-secondary system-sm-medium [&_p]:!m-0 [&_p]:block [&_p]:w-full [&_p]:overflow-hidden [&_p]:text-ellipsis [&_p]:whitespace-nowrap">
         {children}

web/app/components/base/markdown-with-directive/index.spec.tsx

@@ -7,6 +7,10 @@ import { MarkdownWithDirective } from './index'
 
 const FOUR_COLON_RE = /:{4}/
 
+vi.mock('next/image', () => ({
+  default: (props: React.ImgHTMLAttributes<HTMLImageElement>) => <img {...props} />,
+}))
+
 function expectDecorativeIcon(container: HTMLElement, src: string) {
   const icon = container.querySelector('img')
   expect(icon).toBeInTheDocument()

web/app/components/base/modern-monaco/init.ts

@@ -0,0 +1,25 @@
+import type { InitOptions } from 'modern-monaco'
+
+export const LIGHT_THEME_ID = 'light-plus'
+export const DARK_THEME_ID = 'dark-plus'
+
+const DEFAULT_INIT_OPTIONS: InitOptions = {
+  defaultTheme: DARK_THEME_ID,
+  themes: [
+    LIGHT_THEME_ID,
+    DARK_THEME_ID,
+  ],
+}
+
+let monacoInitPromise: Promise<typeof import('modern-monaco/editor-core') | null> | null = null
+
+export const initMonaco = async () => {
+  if (!monacoInitPromise) {
+    monacoInitPromise = (async () => {
+      const { init } = await import('modern-monaco')
+      return init(DEFAULT_INIT_OPTIONS)
+    })()
+  }
+
+  return monacoInitPromise
+}

web/app/components/base/modern-monaco/modern-monaco-editor.tsx

@@ -0,0 +1,250 @@
+'use client'
+
+import type { editor as MonacoEditor } from 'modern-monaco/editor-core'
+import type { FC } from 'react'
+import * as React from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import useTheme from '@/hooks/use-theme'
+import { Theme } from '@/types/app'
+import { cn } from '@/utils/classnames'
+import { DARK_THEME_ID, initMonaco, LIGHT_THEME_ID } from './init'
+
+type ModernMonacoEditorProps = {
+  value: string
+  language: string
+  readOnly?: boolean
+  options?: MonacoEditor.IEditorOptions
+  onChange?: (value: string) => void
+  onFocus?: () => void
+  onBlur?: () => void
+  onReady?: (editor: MonacoEditor.IStandaloneCodeEditor, monaco: typeof import('modern-monaco/editor-core')) => void
+  loading?: React.ReactNode
+  className?: string
+  style?: React.CSSProperties
+}
+
+type MonacoModule = typeof import('modern-monaco/editor-core')
+type EditorCallbacks = Pick<ModernMonacoEditorProps, 'onBlur' | 'onChange' | 'onFocus' | 'onReady'>
+type EditorSetup = {
+  editorOptions: MonacoEditor.IEditorOptions
+  language: string
+  resolvedTheme: string
+}
+
+const syncEditorValue = (
+  editor: MonacoEditor.IStandaloneCodeEditor,
+  monaco: MonacoModule,
+  model: MonacoEditor.ITextModel,
+  value: string,
+  preventTriggerChangeEventRef: React.RefObject<boolean>,
+) => {
+  const currentValue = model.getValue()
+  if (currentValue === value)
+    return
+
+  if (editor.getOption(monaco.editor.EditorOption.readOnly)) {
+    editor.setValue(value)
+    return
+  }
+
+  preventTriggerChangeEventRef.current = true
+  try {
+    editor.executeEdits('', [{
+      range: model.getFullModelRange(),
+      text: value,
+      forceMoveMarkers: true,
+    }])
+    editor.pushUndoStop()
+  }
+  finally {
+    preventTriggerChangeEventRef.current = false
+  }
+}
+
+const bindEditorCallbacks = (
+  editor: MonacoEditor.IStandaloneCodeEditor,
+  monaco: MonacoModule,
+  callbacksRef: React.RefObject<EditorCallbacks>,
+  preventTriggerChangeEventRef: React.RefObject<boolean>,
+) => {
+  const changeDisposable = editor.onDidChangeModelContent(() => {
+    if (preventTriggerChangeEventRef.current)
+      return
+    callbacksRef.current.onChange?.(editor.getValue())
+  })
+  const keydownDisposable = editor.onKeyDown((event) => {
+    const { key, code } = event.browserEvent
+    if (key === ' ' || code === 'Space')
+      event.stopPropagation()
+  })
+  const focusDisposable = editor.onDidFocusEditorText(() => {
+    callbacksRef.current.onFocus?.()
+  })
+  const blurDisposable = editor.onDidBlurEditorText(() => {
+    callbacksRef.current.onBlur?.()
+  })
+
+  return () => {
+    blurDisposable.dispose()
+    focusDisposable.dispose()
+    keydownDisposable.dispose()
+    changeDisposable.dispose()
+  }
+}
+
+export const ModernMonacoEditor: FC<ModernMonacoEditorProps> = ({
+  value,
+  language,
+  readOnly = false,
+  options,
+  onChange,
+  onFocus,
+  onBlur,
+  onReady,
+  loading,
+  className,
+  style,
+}) => {
+  const { theme: appTheme } = useTheme()
+  const resolvedTheme = appTheme === Theme.light ? LIGHT_THEME_ID : DARK_THEME_ID
+  const [isEditorReady, setIsEditorReady] = useState(false)
+  const containerRef = useRef<HTMLDivElement>(null)
+  const editorRef = useRef<MonacoEditor.IStandaloneCodeEditor | null>(null)
+  const modelRef = useRef<MonacoEditor.ITextModel | null>(null)
+  const monacoRef = useRef<MonacoModule | null>(null)
+  const preventTriggerChangeEventRef = useRef(false)
+  const valueRef = useRef(value)
+  const callbacksRef = useRef<EditorCallbacks>({ onChange, onFocus, onBlur, onReady })
+
+  const editorOptions = useMemo<MonacoEditor.IEditorOptions>(() => ({
+    automaticLayout: true,
+    readOnly,
+    domReadOnly: true,
+    minimap: { enabled: false },
+    wordWrap: 'on',
+    fixedOverflowWidgets: true,
+    tabFocusMode: false,
+    ...options,
+  }), [readOnly, options])
+  const setupRef = useRef<EditorSetup>({
+    editorOptions,
+    language,
+    resolvedTheme,
+  })
+
+  useEffect(() => {
+    valueRef.current = value
+  }, [value])
+
+  useEffect(() => {
+    callbacksRef.current = { onChange, onFocus, onBlur, onReady }
+  }, [onChange, onFocus, onBlur, onReady])
+
+  useEffect(() => {
+    setupRef.current = {
+      editorOptions,
+      language,
+      resolvedTheme,
+    }
+  }, [editorOptions, language, resolvedTheme])
+
+  useEffect(() => {
+    let disposed = false
+    let cleanup: (() => void) | undefined
+
+    const setup = async () => {
+      const monaco = await initMonaco()
+      if (!monaco || disposed || !containerRef.current)
+        return
+
+      monacoRef.current = monaco
+
+      const editor = monaco.editor.create(containerRef.current, setupRef.current.editorOptions)
+      editorRef.current = editor
+
+      const model = monaco.editor.createModel(valueRef.current, setupRef.current.language)
+      modelRef.current = model
+
+      editor.setModel(model)
+
+      monaco.editor.setTheme(setupRef.current.resolvedTheme)
+
+      const disposeCallbacks = bindEditorCallbacks(
+        editor,
+        monaco,
+        callbacksRef,
+        preventTriggerChangeEventRef,
+      )
+      const resizeObserver = new ResizeObserver(() => {
+        editor.layout()
+      })
+      resizeObserver.observe(containerRef.current)
+      callbacksRef.current.onReady?.(editor, monaco)
+      setIsEditorReady(true)
+
+      cleanup = () => {
+        resizeObserver.disconnect()
+        disposeCallbacks()
+        editor.dispose()
+        model.dispose()
+        setIsEditorReady(false)
+      }
+    }
+
+    setup()
+
+    return () => {
+      disposed = true
+      cleanup?.()
+    }
+  }, [])
+
+  useEffect(() => {
+    const editor = editorRef.current
+    if (!editor)
+      return
+    editor.updateOptions(editorOptions)
+  }, [editorOptions])
+
+  useEffect(() => {
+    const monaco = monacoRef.current
+    const model = modelRef.current
+    if (!monaco || !model)
+      return
+    monaco.editor.setModelLanguage(model, language)
+  }, [language])
+
+  useEffect(() => {
+    const monaco = monacoRef.current
+    if (!monaco)
+      return
+    monaco.editor.setTheme(resolvedTheme)
+  }, [resolvedTheme])
+
+  useEffect(() => {
+    const editor = editorRef.current
+    const monaco = monacoRef.current
+    const model = modelRef.current
+    if (!editor || !monaco || !model)
+      return
+
+    syncEditorValue(editor, monaco, model, value, preventTriggerChangeEventRef)
+  }, [value])
+
+  return (
+    <div
+      className={cn('relative h-full w-full', className)}
+      style={style}
+    >
+      <div
+        ref={containerRef}
+        className="h-full w-full"
+      />
+      {!isEditorReady && !!loading && (
+        <div className="absolute inset-0 flex items-center justify-center">
+          {loading}
+        </div>
+      )}
+    </div>
+  )
+}